Skip to content

Commit c0fbc30

Browse files
alperozturk96tobiasKaminsky
authored andcommitted
fix adapter
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 23b1f77 commit c0fbc30

4 files changed

Lines changed: 28 additions & 14 deletions

File tree

library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/ElementTypeAdapter.kt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,20 @@ class ElementTypeAdapter :
4242
val typeName = jsonObject.get("element").asString
4343

4444
try {
45+
val prefix = "com.nextcloud.android.lib.resources.clientintegration"
4546
val cls: Class<out Element> =
4647
when (typeName) {
47-
"Button" ->
48-
Class.forName("com.nextcloud.android.lib.resources.clientintegration.Button")
49-
as Class<out Element>
48+
"LayoutButton" ->
49+
Class.forName("$prefix.LayoutButton") as Class<out Element>
5050

51-
"Text" ->
52-
Class.forName("com.nextcloud.android.lib.resources.clientintegration.Text")
53-
as Class<out Element>
51+
"LayoutText" ->
52+
Class.forName("$prefix.LayoutText") as Class<out Element>
5453

55-
"Image" ->
56-
Class.forName("com.nextcloud.android.lib.resources.clientintegration.Image")
57-
as Class<out Element>
54+
"LayoutImage" ->
55+
Class.forName("$prefix.LayoutImage") as Class<out Element>
5856

59-
"URL" ->
60-
Class.forName("com.nextcloud.android.lib.resources.clientintegration.URL")
61-
as Class<out Element>
57+
"LayoutURL" ->
58+
Class.forName("$prefix.LayoutURL") as Class<out Element>
6259

6360
else -> return null
6461
}

library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/Layout.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ import kotlinx.parcelize.Parcelize
1616
data class Layout(
1717
@SerializedName("orientation")
1818
var orientation: LayoutOrientation,
19-
var layoutRows: List<LayoutRow>
19+
var rows: List<LayoutRow>
2020
) : Parcelable
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Nextcloud Android Library
3+
*
4+
* SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
5+
* SPDX-License-Identifier: MIT
6+
*/
7+
8+
package com.nextcloud.android.lib.resources.clientintegration
9+
10+
import android.os.Parcelable
11+
import kotlinx.parcelize.Parcelize
12+
13+
@Parcelize
14+
data class Image(
15+
val url: String
16+
) : Element,
17+
Parcelable

library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/URL.kt renamed to library/src/main/java/com/nextcloud/android/lib/resources/clientintegration/LayoutURL.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import android.os.Parcelable
1212
import kotlinx.parcelize.Parcelize
1313

1414
@Parcelize
15-
data class URL(
15+
data class LayoutURL(
1616
val text: String,
1717
val url: String
1818
) : Element,

0 commit comments

Comments
 (0)