Commit 9500ba8b authored by Craig Earley's avatar Craig Earley
Browse files

patches an issue where styles couldn't find the Comfortaa font

parent 08007d47
......@@ -16,6 +16,7 @@
app:srcCompat="@drawable/about_icon"
android:text="@string/about_text"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:contentDescription="@string/aboutButtonMain"/>
<Button
android:id="@+id/buttonSettings"
......@@ -23,6 +24,7 @@
app:srcCompat="@drawable/settings_icon"
android:text="@string/settings_text"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:contentDescription="@string/settingsButtonMain"/>
<Button
android:id="@+id/buttonNotebook"
......@@ -30,6 +32,7 @@
android:contentDescription="@string/labNotebookButtonMain"
app:srcCompat="@drawable/lab_notebook_icon"
style="@style/miniButtons"
android:fontFamily="@font/comfortaaregular"
android:text="@string/notebook_text"
/>
</LinearLayout>
......@@ -51,6 +54,7 @@
android:contentDescription="@string/benchSample"
android:id="@+id/imageButtonBenchSample"
android:text="@string/bench_sample_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity" />
<Button
style="@style/mainScreenButtons"
......@@ -58,6 +62,7 @@
android:drawableStart="@drawable/builtin_sensors_icon"
android:contentDescription="@string/builtinSensors"
android:text="@string/builtin_sensors_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity" />
<Button
......@@ -66,6 +71,7 @@
android:drawableStart="@drawable/bluetooth_devices"
android:contentDescription="@string/bluetoothSensor"
android:text="@string/bluetooth_devices_text"
android:fontFamily="@font/comfortaaregular"
android:onClick="startSampleActivity"/>
</LinearLayout>
\ No newline at end of file
......@@ -18,7 +18,6 @@
<item name="android:layout_weight">1</item>
<item name="android:background">@null</item>
<item name="android:textSize">@dimen/sample_button_font_size</item>
<item name="android:fontFamily">@font/comfortaaregular"</item>
<item name="android:textAllCaps">false</item>
<item name="android:onClick">startSampleActivity</item>
<item name="android:buttonBarButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
......@@ -28,7 +27,6 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:fontFamily">@font/comfortaaregular</item>
<item name="android:buttonBarButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
</style>
<style name="intervalButtons">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment