diff --git a/app/src/main/res/layout/activity_addsite.xml b/app/src/main/res/layout/activity_addsite.xml
index ff6f3e2..096bd5a 100644
--- a/app/src/main/res/layout/activity_addsite.xml
+++ b/app/src/main/res/layout/activity_addsite.xml
@@ -52,12 +52,10 @@
android:id="@+id/inputName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:fontFamily="@font/lato"
android:hint="@string/site_name"
android:inputType="textPersonName|textCapWords|textAutoCorrect"
- android:textColor="?android:textColorPrimary"
- android:textColorHint="?android:textColorSecondary"
- android:textSize="@dimen/body_font_size"
+ android:textColor="#FFFFFF"
+ style="@style/NockText.Body"
/>
@@ -75,12 +73,10 @@
android:id="@+id/inputUrl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:fontFamily="@font/lato"
android:hint="@string/site_url"
android:inputType="textUri"
- android:textColor="?android:textColorPrimary"
- android:textColorHint="?android:textColorSecondary"
- android:textSize="@dimen/body_font_size"
+ android:textColor="#FFFFFF"
+ style="@style/NockText.Body"
/>
@@ -90,11 +86,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
- android:fontFamily="@font/lato_light"
- android:textColor="?android:textColorPrimary"
- android:textSize="@dimen/caption_font_size"
android:visibility="gone"
tools:text="Warning: this app checks for server availability with HTTP requests. It's recommended that you use an HTTP URL."
+ style="@style/NockText.Footnote"
/>
@@ -111,10 +105,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
- android:fontFamily="@font/lato"
android:text="@string/response_validation_mode"
- android:textColor="?colorAccent"
- android:textSize="@dimen/caption_font_size"
+ style="@style/NockText.SectionHeader"
/>
@@ -140,10 +134,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
- android:fontFamily="@font/lato"
android:text="@string/response_validation_mode"
- android:textColor="?colorAccent"
- android:textSize="@dimen/caption_font_size"
+ style="@style/NockText.SectionHeader"
/>
@@ -194,8 +185,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/content_inset"
android:text="@string/last_check_result"
- android:textColor="?colorAccent"
- android:textSize="@dimen/caption_font_size"
+ style="@style/NockText.SectionHeader"
/>
@@ -71,12 +65,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/list_text_spacing"
- android:fontFamily="@font/lato_light"
android:singleLine="true"
- android:textColor="?android:textColorSecondary"
- android:textSize="@dimen/body_font_size"
android:transitionName="site_url"
tools:text="https://yourwebsitehere.com"
+ style="@style/NockText.Body.Light"
/>
diff --git a/viewcomponents/src/main/res/font/lato_bold.xml b/viewcomponents/src/main/res/font/lato_bold.xml
new file mode 100644
index 0000000..e12d82b
--- /dev/null
+++ b/viewcomponents/src/main/res/font/lato_bold.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/viewcomponents/src/main/res/layout/check_interval_layout.xml b/viewcomponents/src/main/res/layout/check_interval_layout.xml
index 227c408..96c5cca 100644
--- a/viewcomponents/src/main/res/layout/check_interval_layout.xml
+++ b/viewcomponents/src/main/res/layout/check_interval_layout.xml
@@ -12,10 +12,8 @@
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="@font/lato"
android:text="@string/check_interval"
- android:textColor="?colorAccent"
- android:textSize="@dimen/caption_font_size"
+ style="@style/NockText.SectionHeader"
/>
diff --git a/viewcomponents/src/main/res/layout/list_item_spinner_dropdown.xml b/viewcomponents/src/main/res/layout/list_item_spinner_dropdown.xml
index 141b174..ae7bb8a 100644
--- a/viewcomponents/src/main/res/layout/list_item_spinner_dropdown.xml
+++ b/viewcomponents/src/main/res/layout/list_item_spinner_dropdown.xml
@@ -3,10 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="@dimen/button_height"
- android:fontFamily="@font/lato"
android:gravity="center_vertical|start"
android:paddingLeft="@dimen/content_inset"
android:paddingRight="@dimen/content_inset"
- android:textColor="?android:textColorPrimary"
- android:textSize="@dimen/body_font_size"
+ android:textColor="#FFFFFF"
+ style="@style/NockText.Body"
/>
diff --git a/viewcomponents/src/main/res/values/dimens.xml b/viewcomponents/src/main/res/values/dimens.xml
index 50a887b..005a1a9 100644
--- a/viewcomponents/src/main/res/values/dimens.xml
+++ b/viewcomponents/src/main/res/values/dimens.xml
@@ -12,9 +12,9 @@
32dp
20sp
- 16sp
14sp
14sp
+ 12sp
12sp
52dp
diff --git a/viewcomponents/src/main/res/values/preloaded_fonts.xml b/viewcomponents/src/main/res/values/preloaded_fonts.xml
index 6a94ecb..0c550dd 100644
--- a/viewcomponents/src/main/res/values/preloaded_fonts.xml
+++ b/viewcomponents/src/main/res/values/preloaded_fonts.xml
@@ -1,9 +1,10 @@
-
- - @font/fira_mono
- - @font/lato
- - @font/lato_black
- - @font/lato_light
-
+
+ - @font/fira_mono
+ - @font/lato
+ - @font/lato_black
+ - @font/lato_bold
+ - @font/lato_light
+
diff --git a/viewcomponents/src/main/res/values/styles.xml b/viewcomponents/src/main/res/values/styles.xml
new file mode 100644
index 0000000..af9f3ad
--- /dev/null
+++ b/viewcomponents/src/main/res/values/styles.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+