Skip to content

Commit 3fde166

Browse files
Merge pull request #2 from UmairKhalid786/bugfix/ios_internal_compose_correction
Internal functions correction added for iOS
2 parents 2b4dee7 + f32be75 commit 3fde166

File tree

14 files changed

+32
-29
lines changed

14 files changed

+32
-29
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
actual fun getPlatformName(): String = "Android"
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
import androidx.compose.runtime.Composable
22

3-
actual fun getPlatformName(): String = "Android"
4-
53
@Composable fun MainView() = App()

shared/src/commonMain/kotlin/App.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import androidx.compose.material.MaterialTheme
22
import androidx.compose.runtime.Composable
3-
import androidx.compose.runtime.remember
4-
import parsingSDK.Parser
3+
import com.techlads.sdu.parsingSDK.Parser
4+
import com.techlads.sdu.parsingSDK.widgets.*
5+
import com.techlads.sdu.parsingSDK.widgets.Widget
56
import parsingSDK.widgets.*
67

78
@Composable
89
internal fun App() {
910
MaterialTheme {
10-
val widget = remember { horizontalList() }
11-
Parser(widget)
11+
Parser(horizontalList())
1212
}
1313
}
1414

@@ -24,7 +24,7 @@ fun horizontalList(): Widget {
2424
})
2525

2626
val text = Widget(constraints = hashMapOf<String, String>().apply {
27-
put(TEXT, "HiHi")
27+
put(TEXT, "Text")
2828
put(ID, "2")
2929
put(TYPE, "text")
3030
put(PADDING_BOTTOM, "5")
@@ -45,6 +45,3 @@ fun horizontalList(): Widget {
4545

4646
return verticalList
4747
}
48-
49-
50-
expect fun getPlatformName(): String
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
expect fun getPlatformName(): String

shared/src/commonMain/kotlin/parsingSDK/Parser.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package parsingSDK
1+
package com.techlads.sdu.parsingSDK
22

33
import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.Row
@@ -11,11 +11,12 @@ import androidx.compose.runtime.Composable
1111
import androidx.compose.runtime.remember
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.platform.testTag
14-
import parsingSDK.models.WidgetType
14+
import com.techlads.sdu.parsingSDK.widgets.*
15+
import com.techlads.sdu.parsingSDK.models.WidgetType
1516
import parsingSDK.widgets.*
1617

1718
@Composable
18-
fun Parser(widget: Widget, modifier: Modifier = Modifier) {
19+
internal fun Parser(widget: Widget, modifier: Modifier = Modifier) {
1920
when (widget.constraints.type()) {
2021
WidgetType.BUTTON -> {
2122
ParserButton(widget, modifier)
@@ -42,21 +43,21 @@ fun Parser(widget: Widget, modifier: Modifier = Modifier) {
4243
}
4344

4445
@Composable
45-
fun ParserButton(widget: Widget, modifier: Modifier = Modifier) {
46+
internal fun ParserButton(widget: Widget, modifier: Modifier = Modifier) {
4647
val constraints = remember { widget.constraints }
4748
Button(onClick = {}, modifier = modifier.setGeneralProperties(widget.constraints)) {
4849
Text(constraints.text())
4950
}
5051
}
5152

5253
@Composable
53-
fun ParserText(widget: Widget, modifier: Modifier = Modifier) {
54+
internal fun ParserText(widget: Widget, modifier: Modifier = Modifier) {
5455
val constraints = remember { widget.constraints }
5556
Text(constraints.text(), modifier.setGeneralProperties(widget.constraints))
5657
}
5758

5859
@Composable
59-
fun HorizontalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
60+
internal fun HorizontalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
6061
val widgets = remember { widget.childWidget }
6162
LazyRow(modifier = modifier.setGeneralProperties(widget.constraints)) {
6263
items(widgets.size) {
@@ -66,7 +67,7 @@ fun HorizontalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
6667
}
6768

6869
@Composable
69-
fun VerticalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
70+
internal fun VerticalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
7071
val widgets = remember { widget.childWidget }
7172
LazyColumn(modifier = modifier.setGeneralProperties(widget.constraints)) {
7273
items(widgets.size) {
@@ -76,7 +77,7 @@ fun VerticalList(widget: MultiChildWidget, modifier: Modifier = Modifier) {
7677
}
7778

7879
@Composable
79-
fun VerticalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
80+
internal fun VerticalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
8081
val widgets = remember { widget.childWidget }
8182
Column(modifier = modifier.setGeneralProperties(widget.constraints)) {
8283
repeat(widget.childWidget.size) {
@@ -86,7 +87,7 @@ fun VerticalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
8687
}
8788

8889
@Composable
89-
fun HorizontalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
90+
internal fun HorizontalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
9091
val widgets = remember { widget.childWidget }
9192
Row(modifier = modifier.setGeneralProperties(widget.constraints)) {
9293
repeat(widget.childWidget.size) {
@@ -95,7 +96,7 @@ fun HorizontalScroll(widget: MultiChildWidget, modifier: Modifier = Modifier) {
9596
}
9697
}
9798

98-
fun Modifier.setGeneralProperties(constraints: Constraints): Modifier {
99+
internal fun Modifier.setGeneralProperties(constraints: Constraints): Modifier {
99100
constraints.id()?.let { testTag(it) }
100101
return padding(constraints.padding())
101102
.padding(constraints.margin())

shared/src/commonMain/kotlin/parsingSDK/models/WidgetType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package parsingSDK.models
1+
package com.techlads.sdu.parsingSDK.models
22

33
sealed class WidgetType {
44
object EMPTY: WidgetType()

shared/src/commonMain/kotlin/parsingSDK/widgets/Constraints.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package parsingSDK.widgets
22

33
import androidx.compose.foundation.layout.PaddingValues
44
import androidx.compose.ui.unit.dp
5-
import parsingSDK.models.WidgetType
5+
import com.techlads.sdu.parsingSDK.models.WidgetType
66

77

88
typealias Constraints = HashMap<String, String>

shared/src/commonMain/kotlin/parsingSDK/widgets/MultiChildWidget.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package parsingSDK.widgets
1+
package com.techlads.sdu.parsingSDK.widgets
2+
3+
import parsingSDK.widgets.Constraints
24

35
class MultiChildWidget(
46
val childWidget: List<Widget>,

shared/src/commonMain/kotlin/parsingSDK/widgets/SingleChildWidget.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package parsingSDK.widgets
1+
package com.techlads.sdu.parsingSDK.widgets
2+
3+
import parsingSDK.widgets.Constraints
24

35
data class SingleChildWidget(
46
val childWidgets: List<Widget>,
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
package parsingSDK.widgets
1+
package com.techlads.sdu.parsingSDK.widgets
2+
3+
import parsingSDK.widgets.Constraints
24

35
open class Widget(open val constraints: Constraints)

0 commit comments

Comments
 (0)