updated and added new font to test android:theme

chrisjenx · Jan 16, 2015 · 7dbd1b6 · 7dbd1b6
1 parent c39479f
commit 7dbd1b6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf b/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf
diff --git a/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf b/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf
diff --git a/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf b/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf
diff --git a/CalligraphySample/src/main/assets/fonts/gtw.ttf b/CalligraphySample/src/main/assets/fonts/gtw.ttf
diff --git a/CalligraphySample/src/main/res/layout/stub.xml b/CalligraphySample/src/main/res/layout/stub.xml
@@ -1,4 +1,5 @@
 <TextView
+
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

diff --git a/CalligraphySample/src/main/res/values/strings.xml b/CalligraphySample/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <string name="app_name">Calligraphy</string>
+    <string name="defined_gtw">\nThis is text set by the gtw style.\n</string>
     <string name="default_theme">\nThis is text set by the default theme fontPath.\n</string>
     <string name="defined_fontpath_view">\nThis has a font path set to Roboto Bold, on the View.\n</string>
     <string name="defined_incorrect">\nThis has a fontPath set to a font file that does not exist, it goes back to the default.\n</string>

diff --git a/CalligraphySample/src/main/res/values/styles.xml b/CalligraphySample/src/main/res/values/styles.xml
@@ -23,6 +23,11 @@
 
     <style name="AppTheme.Widget"/>
 
+    <style name="TextViewNoStyleParent">
+        <item name="android:textColor">@android:color/holo_blue_dark</item>
+        <item name="fontPath">fonts/gtw.ttf</item>
+    </style>
+
     <style name="AppTheme.Widget.TextView" parent="android:Widget.Holo.Light.TextView">
         <!-- Custom Attr-->
         <item name="fontPath">fonts/RobotoCondensed-Regular.ttf</item>