Merge pull request #4 from ServerDriven/dev/views

Dev/views

Author: parshav

ScreenData/src/main/java/com/pv/screendata/extensions/Container+Extensions.kt

@@ -0,0 +1,16 @@
+package com.pv.screendata.extensions
+
+import com.pv.screendata.objects.SomeView
+import com.pv.screendata.types.ViewType
+import com.pv.screendata.views.SomeContainerView
+
+fun SomeContainerView.toSomeView(): SomeView = SomeView(
+    type = ViewType.container,
+    someContainer = this,
+    someImage = null,
+    someLabel = null,
+    someLabeledImage = null,
+    someCustomView = null,
+    someText = null,
+    someButton = null
+)

ScreenData/src/main/java/com/pv/screendata/extensions/Label+Extensions.kt

@@ -0,0 +1,32 @@
+package com.pv.screendata.extensions
+
+import com.pv.screendata.objects.SomeView
+import com.pv.screendata.types.ViewType
+import com.pv.screendata.views.SomeLabel
+
+fun SomeLabel.toSomeView(): SomeView = SomeView(
+    type = ViewType.label,
+    someContainer = null,
+    someImage = null,
+    someLabel = this,
+    someLabeledImage = null,
+    someCustomView = null,
+    someText = null,
+    someButton = null
+)
+
+fun String.toSomeLabel(): SomeLabel = SomeLabel(
+    id = null,
+    this,
+    null,
+    null,
+    null
+)
+
+fun Pair<String, String>.toSomeLabel(): SomeLabel = SomeLabel(
+    id = null,
+    title = first,
+    subtitle = second,
+    null,
+    null
+)

ScreenData/src/main/java/com/pv/screendata/objects/Color.kt

@@ -1,13 +1,8 @@
 package com.pv.screendata.objects
 
-import com.pv.screendata.objects.destinations.DeepLinkDestination
-import com.pv.screendata.objects.destinations.ScreenDestination
-import com.pv.screendata.objects.destinations.URLDestination
 import com.pv.screendata.types.DestinationType
 
 data class Destination(
+    val toId: String,
     val type: DestinationType,
-    val screen: ScreenDestination?,
-    val url: URLDestination?,
-    val deepLink: DeepLinkDestination?
 )

ScreenData/src/main/java/com/pv/screendata/objects/Destination.kt

@@ -0,0 +1,8 @@
+package com.pv.screendata.objects
+
+data class SomeColor(
+    val red: Float,
+    val green: Float,
+    val blue: Float,
+    val alpha: Float
+)

ScreenData/src/main/java/com/pv/screendata/objects/SomeColor.kt

@@ -0,0 +1,8 @@
+package com.pv.screendata.objects
+
+data class SomeStyle(
+    val backgroundColor: SomeColor?,
+    val foregroundColor: SomeColor?,
+    val isHidden: Boolean,
+    val cornerRadius: Int
+)

ScreenData/src/main/java/com/pv/screendata/objects/SomeStyle.kt

@@ -3,12 +3,16 @@ package com.pv.screendata.objects
 import com.pv.screendata.types.ViewType
 import com.pv.screendata.views.*
 
+// preview all models with Some?
+// add a spacer view?
 data class SomeView(
     val type: ViewType,
 
-    val container: ContainerView?,
-    val image: Image?,
-    val label: Label?,
-    val labeledImage: LabeledImage?,
-    val view: View?
+    val someText: SomeText?,
+    val someButton: SomeButton?,
+    val someContainer: SomeContainerView?,
+    val someImage: SomeImage?,
+    val someLabel: SomeLabel?,
+    val someLabeledImage: SomeLabeledImage?,
+    val someCustomView: SomeCustomView?
 )

ScreenData/src/main/java/com/pv/screendata/objects/SomeView.kt

@@ -1,14 +1,16 @@
 package com.pv.screendata.screens
 
-import com.pv.screendata.objects.Color
+import com.pv.screendata.objects.SomeColor
 import com.pv.screendata.objects.SomeView
 
-data class Screen(
+// should view just be container view ? What screen would have a label ?
+
+data class SomeScreen(
     val id: String?,
     val title: String,
     val subtitle: String?,
-    val backgroundColor: Color,
+    val backgroundColor: SomeColor,
     val headerView: SomeView?,
-    val view: SomeView,
+    val someView: SomeView,
     val footerView: SomeView?
 )

ScreenData/src/main/java/com/pv/screendata/objects/Style.kt

@@ -1,6 +1,8 @@
 package com.pv.screendata.types
 
 enum class ViewType {
+    text,
+    button,
     label,
     image,
     labeledImage,

ScreenData/src/main/java/com/pv/screendata/objects/destinations/DeepLinkDestination.kt

@@ -0,0 +1,16 @@
+package com.pv.screendata.views
+
+import com.pv.screendata.objects.Destination
+import com.pv.screendata.objects.SomeStyle
+import com.pv.screendata.types.ViewType
+
+// Runs action before destination
+data class SomeButton(
+    val id: String?,
+    val actionId: String?,
+    val title: String,
+    val destination: Destination?,
+    val style: SomeStyle?
+) {
+    val type: ViewType = ViewType.button
+}

ScreenData/src/main/java/com/pv/screendata/objects/destinations/ScreenDestination.kt

@@ -1,15 +1,15 @@
 package com.pv.screendata.views
 
 import com.pv.screendata.objects.SomeView
-import com.pv.screendata.objects.Style
+import com.pv.screendata.objects.SomeStyle
 import com.pv.screendata.types.ViewDirectionAxis
 import com.pv.screendata.types.ViewType
 
-data class ContainerView(
+data class SomeContainerView(
     val id: String?,
     val axis: ViewDirectionAxis,
-    val views: Array<SomeView>,
-    val style: Style?
+    val someViews: Array<SomeView>,
+    val someStyle: SomeStyle?
 ) {
     val type: ViewType = ViewType.container
 }

ScreenData/src/main/java/com/pv/screendata/objects/destinations/URLDestination.kt

@@ -2,19 +2,19 @@ package com.pv.screendata.views
 
 import com.pv.screendata.objects.Destination
 import com.pv.screendata.objects.SomeView
-import com.pv.screendata.objects.Style
+import com.pv.screendata.objects.SomeStyle
 import com.pv.screendata.types.ViewDirectionAxis
 import com.pv.screendata.types.ViewType
 
-data class View(
+data class SomeCustomView(
     val id: String?,
     val title: String,
     val subtitle: String?,
-    val style: Style?,
-    val image: Image?,
+    val someStyle: SomeStyle?,
+    val someImage: SomeImage?,
     val destination: Destination?,
     val axis: ViewDirectionAxis,
-    val views: Array<SomeView>
+    val someViews: Array<SomeView>
 ) {
     val type: ViewType = ViewType.custom
 }

ScreenData/src/main/java/com/pv/screendata/screens/Screen.kt renamed to ScreenData/src/main/java/com/pv/screendata/screens/SomeScreen.kt

@@ -1,13 +1,13 @@
 package com.pv.screendata.views
 
 import com.pv.screendata.objects.Destination
-import com.pv.screendata.objects.Style
+import com.pv.screendata.objects.SomeStyle
 import com.pv.screendata.types.ViewType
 
-data class Image(
+data class SomeImage(
     val id: String?,
     val url: String,
-    val style: Style?,
+    val someStyle: SomeStyle?,
     val destination: Destination?
 ) {
     val type: ViewType = ViewType.image

ScreenData/src/main/java/com/pv/screendata/types/ViewType.kt

@@ -1,14 +1,14 @@
 package com.pv.screendata.views
 
 import com.pv.screendata.objects.Destination
-import com.pv.screendata.objects.Style
+import com.pv.screendata.objects.SomeStyle
 import com.pv.screendata.types.ViewType
 
-data class Label(
+data class SomeLabel(
     val id: String?,
     val title: String,
     val subtitle: String?,
-    val style: Style?,
+    val someStyle: SomeStyle?,
     val destination: Destination?
 ) {
     val type: ViewType = ViewType.label

ScreenData/src/main/java/com/pv/screendata/views/SomeButton.kt

@@ -1,15 +1,15 @@
 package com.pv.screendata.views
 
 import com.pv.screendata.objects.Destination
-import com.pv.screendata.objects.Style
+import com.pv.screendata.objects.SomeStyle
 import com.pv.screendata.types.ViewType
 
-data class LabeledImage(
+data class SomeLabeledImage(
     val id: String?,
     val title: String,
     val subtitle: String?,
-    val image: Image,
-    val style: Style?,
+    val someImage: SomeImage,
+    val someStyle: SomeStyle?,
     val destination: Destination?
 ) {
     val type: ViewType = ViewType.labeledImage

ScreenData/src/main/java/com/pv/screendata/views/ContainerView.kt renamed to ScreenData/src/main/java/com/pv/screendata/views/SomeContainerView.kt

@@ -0,0 +1,12 @@
+package com.pv.screendata.views
+
+import com.pv.screendata.objects.SomeStyle
+import com.pv.screendata.types.ViewType
+
+data class SomeText(
+    val id: String?,
+    val title: String,
+    val style: SomeStyle?,
+) {
+    val type: ViewType = ViewType.text
+}

ScreenData/src/main/java/com/pv/screendata/views/View.kt renamed to ScreenData/src/main/java/com/pv/screendata/views/SomeCustomView.kt

@@ -1,8 +1,66 @@
 package com.pv.screendata
 
+import androidx.compose.foundation.Text
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.Scaffold
+import androidx.compose.material.TopAppBar
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.ui.tooling.preview.Preview
+import com.pv.screendata.extensions.toSomeLabel
+import com.pv.screendata.extensions.toSomeView
+import com.pv.screendata.objects.SomeColor as SomeColor
+import com.pv.screendata.screens.SomeScreen
+import com.pv.screendata.types.ViewDirectionAxis
+import com.pv.screendata.views.SomeContainerView
 
 @Composable
-fun SDSCreen() {
+fun SDSCreen(screen: SomeScreen) {
+    Scaffold(
+        Modifier.fillMaxSize(),
+        backgroundColor = Color(
+            screen.backgroundColor.red,
+            screen.backgroundColor.green,
+            screen.backgroundColor.blue
+        ),
+        topBar = {
+            TopAppBar(title = {
+                Text(screen.title)
+            })
+        },
+    ) {
+        SDSomeView(someView = screen.someView)
+    }
+}
 
+@Preview(showBackground = true)
+@Composable
+fun sdScreenPreview() {
+    SDSCreen(
+        screen = SomeScreen(
+            id = "yoloId",
+            title = "YoloTitile",
+            subtitle = null,
+            backgroundColor = SomeColor(
+                0f,
+                188f,
+                212f,
+                1f
+            ),
+            headerView = null,
+            someView = SomeContainerView(
+                id = null,
+                axis = ViewDirectionAxis.vertical,
+                someViews = arrayOf(
+                    "monkaW".toSomeLabel().toSomeView(),
+                    "pogs".toSomeLabel().toSomeView(),
+                    Pair("Something", "Worse").toSomeLabel().toSomeView(),
+                    "Pogs".toSomeLabel().toSomeView()
+                ),
+                someStyle = null
+            ).toSomeView(),
+            footerView = null
+        )
+    )
 }