Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version.versionMajor=0
version.versionMinor=42
version.versionPatch=4
version.versionPatch=5
version.useDatedVersionName=false
Original file line number Diff line number Diff line change
Expand Up @@ -1428,13 +1428,7 @@ class HomeScreenViewModel(
type = parseWidgetType(curr),
layout = when (val source = curr.source) {
is Widget.Source.Bundled -> UNDEFINED_LAYOUT_CODE
is Widget.Source.Default -> {
if (source.obj.layout == ObjectType.Layout.OBJECT_TYPE) {
UNDEFINED_LAYOUT_CODE
} else {
source.obj.layout?.code ?: UNDEFINED_LAYOUT_CODE
}
}
is Widget.Source.Default -> source.obj.layout?.code ?: UNDEFINED_LAYOUT_CODE
Widget.Source.Other -> UNDEFINED_LAYOUT_CODE
},
isInEditMode = isInEditMode()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ class SelectWidgetTypeViewModel(

objectLayout == ObjectType.Layout.OBJECT_TYPE -> {
listOf(
WidgetTypeView.View(),
WidgetTypeView.CompactList(),
WidgetTypeView.List(),
WidgetTypeView.Link()
)
}
Expand Down Expand Up @@ -171,6 +173,7 @@ class SelectWidgetTypeViewModel(

objectLayout == ObjectType.Layout.OBJECT_TYPE -> {
listOf(
WidgetTypeView.View(isSelected = false),
WidgetTypeView.CompactList(),
WidgetTypeView.List(),
WidgetTypeView.Link()
Expand Down
Loading