diff --git a/app/src/main/res/layout/activity_addsite.xml b/app/src/main/res/layout/activity_addsite.xml
index f7bd3e8..80f83da 100644
--- a/app/src/main/res/layout/activity_addsite.xml
+++ b/app/src/main/res/layout/activity_addsite.xml
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/content_inset"
android:layout_marginTop="@dimen/content_inset_half"
- android:background="@color/lighterGray"
+ android:background="?scriptLayoutBackground"
/>
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d69b862..f840cee 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,7 +7,9 @@
#212121
#252525
- #303030
+ #303030
+ #EEEEEE
+
#FF6E40
#E44615
#40FF6E40
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1cb4a89..e4b435a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,7 +6,7 @@
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index decbdb8..dc5e3d6 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -9,6 +9,7 @@
- #000000
- #EEEEEE
- #000000
+ - @color/lighterGray
- #212121
- #727272
@@ -33,6 +34,7 @@
- #ffffff
- #303030
- #FFFFFF
+ - @color/darkerGray
- #FFFFFF
- #F0F0F0
diff --git a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt
index 445c931..e543863 100644
--- a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt
+++ b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/ext/ViewExt.kt
@@ -18,7 +18,6 @@ package com.afollestad.nocknock.viewcomponents.ext
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
-import android.view.ViewTreeObserver
import androidx.annotation.DimenRes
import com.afollestad.vvalidator.form.Condition
@@ -32,18 +31,6 @@ fun View.hide() {
fun View.showOrHide(show: Boolean) = if (show) show() else hide()
-fun View.onLayout(cb: () -> Unit) {
- if (this.viewTreeObserver.isAlive) {
- this.viewTreeObserver.addOnGlobalLayoutListener(
- object : ViewTreeObserver.OnGlobalLayoutListener {
- override fun onGlobalLayout() {
- cb()
- this@onLayout.viewTreeObserver.removeOnGlobalLayoutListener(this)
- }
- })
- }
-}
-
fun View.dimenFloat(@DimenRes res: Int) = resources.getDimension(res)
fun View.dimenInt(@DimenRes res: Int) = resources.getDimensionPixelSize(res)
diff --git a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt
index 176f32d..1b1a29f 100644
--- a/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt
+++ b/viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/js/JavaScriptInputLayout.kt
@@ -52,7 +52,7 @@ class JavaScriptInputLayout(
contentInset // bottom
)
elevation = dimenFloat(dimen.default_elevation)
- inflate(context, layout.javascript_input_layout, this)
+ inflate(context, R.layout.javascript_input_layout, this)
}
fun attach(