Better style selection on 2 element page and dynamic style on remove element.

Author: zorgluf

app/src/main/java/fr/nuage/souvenirs/model/Page.java

@@ -87,6 +87,7 @@ public void delElement(Element element) {
             tmp.remove(element);
             setElements(tmp);
         }
+        new TilePageBuilder().applyDefaultStyle(this);
     }
 
     public ImageElement createImageElement() {

app/src/main/java/fr/nuage/souvenirs/model/TilePageBuilder.java

@@ -4,6 +4,7 @@
 
 import android.content.ContentResolver;
 import android.net.Uri;
+import android.provider.ContactsContract;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -32,7 +33,7 @@ public class TilePageBuilder {
                     { 0, 0, 100, 100 }
             },
             {
-                    // 2 V (1 small)
+                    // 2 V (1 small) -> title style
                     { 0, 0, 100, 80 },
                     { 0, 80, 100, 100 }
             },
@@ -278,14 +279,38 @@ public void applyStyle(int style, Page page) {
     }
 
     public int getDefaultStyle(Page page) {
-        int defStyle=-1;
-        for (int i=0;i<getPageStyleMap().length;i++) {
-            int visibleElements = 0;
-            for (Element element: page.getElements()) {
-                if ((element instanceof ImageElement) || (element instanceof TextElement)) {
-                    visibleElements += 1;
+        int visibleElements = 0;
+        boolean hasTextElement = false;
+        boolean areAllPortrait = true;
+        for (Element element: page.getElements()) {
+            if ((element instanceof ImageElement) || (element instanceof TextElement) || (element instanceof VideoElement)) {
+                visibleElements += 1;
+            }
+            if (element instanceof TextElement) {
+                hasTextElement = true;
+            }
+            if (element instanceof ImageElement) {
+                if (!Utils.isImagePortrait((ImageElement)element)) {
+                    areAllPortrait = false;
                 }
             }
+        }
+        //for 2 elements
+        if (visibleElements == 2) {
+            //if text, apply title style
+            if (hasTextElement) {
+                return 1;
+            }
+            //if images, test if portrait or landscape
+            if (areAllPortrait) {
+                return 3;
+            } else {
+                return 2;
+            }
+        }
+        //generic : choose first matching style in list
+        int defStyle=-1;
+        for (int i=0;i<getPageStyleMap().length;i++) {
             if (getPageStyleMap()[i].length == visibleElements) {
                 defStyle = i;
                 break;

app/src/main/java/fr/nuage/souvenirs/model/Utils.java

@@ -38,11 +38,15 @@ public static void copyFileUsingStream(File source, File dest) throws IOExceptio
         }
     }
 
+    public static boolean isImagePortrait(ImageElement element) {
+        return element.getImageHeight() > element.getImageWidth();
+    }
+
     public static class NextcloudFile {
 
-        private String filePath;
-        private boolean isDir;
-        private long modDate;
+        private final String filePath;
+        private final boolean isDir;
+        private final long modDate;
 
         public NextcloudFile(String filePath, boolean isDir, long modDate) {
             this.filePath = filePath;