Merge branch 'master' into master

Author: Osanosa

app/apk/src/main/res/layout/item_module_md2.xml

@@ -140,8 +140,8 @@
                     android:enabled="true"
                     android:focusable="true"
                     android:alpha="@{item.updateReady ? 1.0f : 0.38f}"
-                    android:textColor="@{item.updateReady ? ?attr/colorPrimary : ?attr/colorOnSurfaceVariant}"
-                    app:iconTint="@{item.updateReady ? ?attr/colorPrimary : ?attr/colorOnSurfaceVariant}"
+                    android:textColor="@{item.updateReady ? (?attr/colorPrimary) : (?attr/colorOnSurfaceVariant)}"
+                    app:iconTint="@{item.updateReady ? (?attr/colorPrimary) : (?attr/colorOnSurfaceVariant)}"
                     android:onClick="@{() -> viewModel.onUpdateClicked(item)}"
                     android:text="@string/update"
                     android:textAllCaps="false"