Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish Hotfix-FixBuild

Browse Source
This commit is contained in:
Giuseppe Scorrano 2019-01-09 16:42:28 +01:00
commit 72a0724577
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_picking_libero.xml
View File

@ -170,7 +170,7 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:src="@drawable/fab_add" android:src="@drawable/fab_add"
android:onClick="@{() -> viewmodel.createNewLU()}" android:onClick="@{() -> viewmodel.createNewLU()}"
android:visibility="@{viewmodel.mtbColt.get() == null ? View.VISIBLE : View.GONE}" android:visibility="@{viewmodel.mtbColt == null ? View.VISIBLE : View.GONE}"
fab:fab_colorNormal="@color/colorPrimary" fab:fab_colorNormal="@color/colorPrimary"
fab:fab_colorPressed="@color/white_pressed" fab:fab_colorPressed="@color/white_pressed"
fab:fab_colorRipple="#66FFFFFF"/> fab:fab_colorRipple="#66FFFFFF"/>
@ -185,7 +185,7 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:src="@drawable/ic_check_white_24dp" android:src="@drawable/ic_check_white_24dp"
android:onClick="@{() -> viewmodel.closeLU()}" android:onClick="@{() -> viewmodel.closeLU()}"
android:visibility="@{viewmodel.mtbColt.get() != null ? View.VISIBLE : View.GONE}" android:visibility="@{viewmodel.mtbColt != null ? View.VISIBLE : View.GONE}"
fab:fab_colorNormal="@color/mainGreen" fab:fab_colorNormal="@color/mainGreen"
fab:fab_colorPressed="@color/white_pressed" fab:fab_colorPressed="@color/white_pressed"
fab:fab_colorRipple="#66FFFFFF"/> fab:fab_colorRipple="#66FFFFFF"/>

1
waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
View File

@ -300,6 +300,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
internal constructor(superState: Parcelable) : super(superState) internal constructor(superState: Parcelable) : super(superState)
companion object { companion object {
@JvmField
internal val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> { internal val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
override fun createFromParcel(source: Parcel): SavedState { override fun createFromParcel(source: Parcel): SavedState {
return SavedState(source) return SavedState(source)