diff --git a/CalligraphySample/build.gradle b/CalligraphySample/build.gradle index 5f4cb68..fb2186d 100644 --- a/CalligraphySample/build.gradle +++ b/CalligraphySample/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 21 - buildToolsVersion "21.1.1" + buildToolsVersion "21.1.2" defaultConfig { minSdkVersion 7 @@ -29,8 +29,8 @@ android { dependencies { compile project(':calligraphy') - compile 'com.android.support:support-v4:21.0.2' - compile 'com.android.support:appcompat-v7:21.0.2' + compile 'com.android.support:support-v4:21.0.3' + compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.jakewharton:butterknife:5.1.2' } diff --git a/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf b/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf old mode 100755 new mode 100644 index aaf374d..072b842 Binary files a/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf and b/CalligraphySample/src/main/assets/fonts/Roboto-Bold.ttf differ diff --git a/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf b/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf old mode 100755 new mode 100644 index 63e9f97..0b53ba4 Binary files a/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf and b/CalligraphySample/src/main/assets/fonts/Roboto-ThinItalic.ttf differ diff --git a/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf b/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf old mode 100755 new mode 100644 index 65bf32a..713fd30 Binary files a/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf and b/CalligraphySample/src/main/assets/fonts/RobotoCondensed-Regular.ttf differ diff --git a/CalligraphySample/src/main/assets/fonts/gtw.ttf b/CalligraphySample/src/main/assets/fonts/gtw.ttf new file mode 100755 index 0000000..eb97fed Binary files /dev/null and b/CalligraphySample/src/main/assets/fonts/gtw.ttf differ diff --git a/CalligraphySample/src/main/res/layout/stub.xml b/CalligraphySample/src/main/res/layout/stub.xml index a164603..b7dc9b5 100644 --- a/CalligraphySample/src/main/res/layout/stub.xml +++ b/CalligraphySample/src/main/res/layout/stub.xml @@ -1,4 +1,6 @@ - + android:text="@string/defined_view_stub"/> diff --git a/CalligraphySample/src/main/res/layout/stub_with_font_path.xml b/CalligraphySample/src/main/res/layout/stub_with_font_path.xml index 91a8f57..f1db77e 100644 --- a/CalligraphySample/src/main/res/layout/stub_with_font_path.xml +++ b/CalligraphySample/src/main/res/layout/stub_with_font_path.xml @@ -1,6 +1,8 @@ + android:text="@string/defined_view_stub_font_path" + tools:ignore="MissingPrefix"/> diff --git a/CalligraphySample/src/main/res/values/strings.xml b/CalligraphySample/src/main/res/values/strings.xml index 646b9c4..618febf 100644 --- a/CalligraphySample/src/main/res/values/strings.xml +++ b/CalligraphySample/src/main/res/values/strings.xml @@ -2,6 +2,7 @@ Calligraphy + \nThis is text set by the gtw style.\n \nThis is text set by the default theme fontPath.\n \nThis has a font path set to Roboto Bold, on the View.\n \nThis has a fontPath set to a font file that does not exist, it goes back to the default.\n diff --git a/CalligraphySample/src/main/res/values/styles.xml b/CalligraphySample/src/main/res/values/styles.xml index e32bcbb..640f473 100644 --- a/CalligraphySample/src/main/res/values/styles.xml +++ b/CalligraphySample/src/main/res/values/styles.xml @@ -23,6 +23,11 @@ +