Merge pull request #116 from chrisjenx/triage-for-2-0-0-release

Triage for 2 0 0 release
chrisjenx · Jan 16, 2015 · 0b03285 · 0b03285
2 parents b2eeccd + 7dbd1b6
commit 0b03285
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 8 deletions.
diff --git 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
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,6 @@
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView
+
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/defined_view_stub" />
+    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
@@ -1,6 +1,8 @@
 <TextView
     fontPath="fonts/Oswald-Stencbab.ttf"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/defined_view_stub_font_path" />
+    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
@@ -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>

diff --git a/calligraphy/build.gradle b/calligraphy/build.gradle
@@ -14,7 +14,7 @@ repositories {
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    provided 'com.android.support:appcompat-v7:21.0.2'
+    provided 'com.android.support:appcompat-v7:21.0.3'
 }
 
 apply from: '../gradle/deploy.gradle'