Improve custom layouts in different form factors

app/build.gradle.kts

@@ -127,6 +127,7 @@ dependencies {
     implementation(libs.androidx.room.rxjava)
     implementation(libs.androidx.splashscreen)
     implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.window)
     implementation(libs.androidx.work)
     implementation(libs.android.material)
 

app/src/main/AndroidManifest.xml

@@ -117,7 +117,8 @@
         <activity
             android:name=".ui.layouteditor.LayoutEditorActivity"
             android:theme="@style/EmulatorTheme"
-            android:label="@string/layout_editor">
+            android:label="@string/layout_editor"
+            android:configChanges="orientation|screenSize|screenSize">
         </activity>
         <activity
             android:name=".ui.backgrounds.BackgroundsActivity"

app/src/main/java/me/magnum/melonds/di/MelonModule.kt

@@ -26,6 +26,7 @@ import me.magnum.melonds.domain.services.ConfigurationDirectoryVerifier
 import me.magnum.melonds.domain.services.DSiNandManager
 import me.magnum.melonds.impl.AndroidDSiNandManager
 import me.magnum.melonds.impl.*
+import me.magnum.melonds.impl.layout.UILayoutProvider
 import me.magnum.melonds.impl.romprocessors.Api24RomFileProcessorFactory
 import me.magnum.melonds.impl.romprocessors.OldRomFileProcessorFactory
 import me.magnum.melonds.ui.romdetails.RomDetailsUiMapper
@@ -150,8 +151,13 @@ object MelonModule {
 
     @Provides
     @Singleton
-    fun provideDefaultLayoutBuilder(@ApplicationContext context: Context, screenUnitsConverter: ScreenUnitsConverter): DefaultLayoutProvider {
-        return DefaultLayoutProvider(context, screenUnitsConverter)
+    fun provideDefaultLayoutBuilder(screenUnitsConverter: ScreenUnitsConverter): DefaultLayoutProvider {
+        return DefaultLayoutProvider(screenUnitsConverter)
+    }
+
+    @Provides
+    fun provideUILayoutProvider(defaultLayoutProvider: DefaultLayoutProvider): UILayoutProvider {
+        return UILayoutProvider(defaultLayoutProvider)
     }
 
     @Provides

app/src/main/java/me/magnum/melonds/di/MigrationModule.kt

@@ -48,6 +48,7 @@ object MigrationModule {
             registerMigration(Migration24to25(genericJsonArrayMigrationHelper, context))
             registerMigration(Migration25to26(genericJsonArrayMigrationHelper))
             registerMigration(Migration30to31(genericJsonArrayMigrationHelper))
+            registerMigration(Migration31to32(context, genericJsonArrayMigrationHelper))
         }
     }
 }

app/src/main/java/me/magnum/melonds/domain/model/Background.kt

@@ -1,6 +1,7 @@
 package me.magnum.melonds.domain.model
 
 import android.net.Uri
+import me.magnum.melonds.domain.model.ui.Orientation
 import java.util.*
 
 data class Background(val id: UUID?, val name: String, val orientation: Orientation, val uri: Uri)

app/src/main/java/me/magnum/melonds/domain/model/Point.kt

@@ -1,5 +1,5 @@
 package me.magnum.melonds.domain.model
 
-class Point(var x: Int, var y: Int) {
+data class Point(var x: Int, var y: Int) {
     constructor() : this(0, 0)
 }

app/src/main/java/me/magnum/melonds/domain/model/Rect.kt

@@ -1,3 +1,8 @@
 package me.magnum.melonds.domain.model
 
-data class Rect(val x: Int, val y: Int, val width: Int, val height: Int)
+data class Rect(val x: Int, val y: Int, val width: Int, val height: Int) {
+
+    val bottom get() = y + height
+
+    val right get() = x + width
+}

app/src/main/java/me/magnum/melonds/domain/model/RuntimeBackground.kt

@@ -1,5 +1,7 @@
 package me.magnum.melonds.domain.model
 
+import me.magnum.melonds.domain.model.layout.BackgroundMode
+
 data class RuntimeBackground(val background: Background?, val mode: BackgroundMode) {
 
     companion object {

app/src/main/java/me/magnum/melonds/domain/model/layout/BackgroundMode.kt

@@ -0,0 +1,10 @@
+package me.magnum.melonds.domain.model.layout
+
+enum class BackgroundMode {
+    STRETCH,
+    FIT_CENTER,
+    FIT_TOP,
+    FIT_LEFT,
+    FIT_BOTTOM,
+    FIT_RIGHT;
+}

app/src/main/java/me/magnum/melonds/domain/model/LayoutComponent.kt → app/src/main/java/me/magnum/melonds/domain/model/layout/LayoutComponent.kt

@@ -1,4 +1,4 @@
-package me.magnum.melonds.domain.model
+package me.magnum.melonds.domain.model.layout
 
 enum class LayoutComponent {
     TOP_SCREEN,

app/src/main/java/me/magnum/melonds/domain/model/LayoutConfiguration.kt → app/src/main/java/me/magnum/melonds/domain/model/layout/LayoutConfiguration.kt

@@ -1,4 +1,4 @@
-package me.magnum.melonds.domain.model
+package me.magnum.melonds.domain.model.layout
 
 import java.util.UUID
 
@@ -9,20 +9,27 @@ data class LayoutConfiguration(
     val orientation: LayoutOrientation,
     val useCustomOpacity: Boolean,
     val opacity: Int,
-    val portraitLayout: UILayout,
-    val landscapeLayout: UILayout
+    val layoutVariants: Map<UILayoutVariant, UILayout>,
 ) {
 
     companion object {
         val DEFAULT_ID = UUID(0, 0)
 
-        fun newCustom(portraitLayout: UILayout, landscapeLayout: UILayout): LayoutConfiguration {
-            return LayoutConfiguration(null, null, LayoutType.CUSTOM, LayoutOrientation.FOLLOW_SYSTEM, false, 50, portraitLayout, landscapeLayout)
+        fun newCustom(): LayoutConfiguration {
+            return LayoutConfiguration(
+                id = null,
+                name = null,
+                type = LayoutType.CUSTOM,
+                orientation = LayoutOrientation.FOLLOW_SYSTEM,
+                useCustomOpacity = false,
+                opacity = 50,
+                layoutVariants = emptyMap(),
+            )
         }
     }
 
     // Empty constructor to include defaults that help in migrations
-    constructor() : this(null, null, LayoutType.CUSTOM, LayoutOrientation.FOLLOW_SYSTEM, false, 50, UILayout(), UILayout())
+    constructor() : this(null, null, LayoutType.CUSTOM, LayoutOrientation.FOLLOW_SYSTEM, false, 50, emptyMap())
 
     enum class LayoutType {
         DEFAULT,

app/src/main/java/me/magnum/melonds/domain/model/layout/PositionedLayoutComponent.kt

@@ -0,0 +1,9 @@
+package me.magnum.melonds.domain.model.layout
+
+import me.magnum.melonds.domain.model.Rect
+
+data class PositionedLayoutComponent(val rect: Rect, val component: LayoutComponent) {
+    fun isScreen(): Boolean {
+        return component.isScreen()
+    }
+}

app/src/main/java/me/magnum/melonds/domain/model/layout/ScreenFold.kt

@@ -0,0 +1,16 @@
+package me.magnum.melonds.domain.model.layout
+
+import me.magnum.melonds.domain.model.Rect
+import me.magnum.melonds.domain.model.ui.Orientation
+
+data class ScreenFold(
+    val orientation: Orientation,
+    val type: FoldType,
+    val foldBounds: Rect,
+) {
+
+    enum class FoldType {
+        SEAMLESS,
+        GAP,
+    }
+}

app/src/main/java/me/magnum/melonds/domain/model/layout/UILayout.kt

@@ -0,0 +1,14 @@
+package me.magnum.melonds.domain.model.layout
+
+import java.util.UUID
+
+data class UILayout(
+    val backgroundId: UUID?,
+    val backgroundMode: BackgroundMode,
+    val components: List<PositionedLayoutComponent>?,
+) {
+    // Empty constructor allow parsing after new data is added to the class
+    constructor() : this(null)
+
+    constructor(components: List<PositionedLayoutComponent>?): this(null, BackgroundMode.FIT_CENTER, components)
+}

app/src/main/java/me/magnum/melonds/domain/model/layout/UILayoutVariant.kt

@@ -0,0 +1,10 @@
+package me.magnum.melonds.domain.model.layout
+
+import me.magnum.melonds.domain.model.Point
+import me.magnum.melonds.domain.model.ui.Orientation
+
+data class UILayoutVariant(
+    val uiSize: Point,
+    val orientation: Orientation,
+    val folds: List<ScreenFold>,
+)

app/src/main/java/me/magnum/melonds/domain/model/Orientation.kt → app/src/main/java/me/magnum/melonds/domain/model/ui/Orientation.kt

@@ -1,4 +1,4 @@
-package me.magnum.melonds.domain.model
+package me.magnum.melonds.domain.model.ui
 
 enum class Orientation {
     PORTRAIT,

app/src/main/java/me/magnum/melonds/domain/repositories/LayoutsRepository.kt

@@ -3,7 +3,7 @@ package me.magnum.melonds.domain.repositories
 import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Observable
-import me.magnum.melonds.domain.model.LayoutConfiguration
+import me.magnum.melonds.domain.model.layout.LayoutConfiguration
 import java.util.*
 
 interface LayoutsRepository {

app/src/main/java/me/magnum/melonds/extensions/ActivityExtensions.kt

@@ -2,7 +2,7 @@ package me.magnum.melonds.extensions
 
 import android.app.Activity
 import android.content.pm.ActivityInfo
-import me.magnum.melonds.domain.model.LayoutConfiguration
+import me.magnum.melonds.domain.model.layout.LayoutConfiguration
 
 /**
  * Requests the best activity orientation that satisfies the given [layoutOrientation].

app/src/main/java/me/magnum/melonds/extensions/ViewExtensions.kt

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.core.view.children
-import me.magnum.melonds.domain.model.BackgroundMode
+import me.magnum.melonds.domain.model.layout.BackgroundMode
 
 fun View.setViewEnabledRecursive(enabled: Boolean) {
     this.isEnabled = enabled