Merge branch 'release/1.4'

johnkil · Aug 11, 2013 · c4d5f34 · c4d5f34
2 parents 9ab0549 + 80a871e
commit c4d5f34
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,5 +30,9 @@ local.properties
 proguard.cfg
 proguard-project.txt
 
+#Gradle
+.gradle
+build
+
 #Other
 .DS_Store
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.devspark.robototextview"
-          android:versionCode="4"
-          android:versionName="1.3">
+          android:versionCode="5"
+          android:versionName="1.4">
 
     <uses-sdk
             android:minSdkVersion="3"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@ Change Log
 ==========
 
 
+Version 1.4 *(2013-08-11)*
+--------------------------
+
+* Support brand new `Roboto` typefaces from Android 4.3 ([info](http://www.androidpolice.com/2013/06/29/typeface-teardown-roboto-gets-a-facelift-in-android-4-3/)).
+* Add Gradle build.
+* Fix: #14 RobotoMultiAutoCompleteTextView inheritance.
+
+
 Version 1.3 *(2013-05-20)*
 --------------------------
 

diff --git a/assets/fonts/Roboto-Bold.ttf b/assets/fonts/Roboto-Bold.ttf
diff --git a/assets/fonts/Roboto-BoldCondensed.ttf b/assets/fonts/Roboto-BoldCondensed.ttf
diff --git a/assets/fonts/Roboto-BoldCondensedItalic.ttf b/assets/fonts/Roboto-BoldCondensedItalic.ttf
diff --git a/assets/fonts/Roboto-BoldItalic.ttf b/assets/fonts/Roboto-BoldItalic.ttf
diff --git a/assets/fonts/Roboto-Condensed.ttf b/assets/fonts/Roboto-Condensed.ttf
diff --git a/assets/fonts/Roboto-CondensedItalic.ttf b/assets/fonts/Roboto-CondensedItalic.ttf
diff --git a/assets/fonts/Roboto-Italic.ttf b/assets/fonts/Roboto-Italic.ttf
diff --git a/assets/fonts/Roboto-Light.ttf b/assets/fonts/Roboto-Light.ttf
diff --git a/assets/fonts/Roboto-LightItalic.ttf b/assets/fonts/Roboto-LightItalic.ttf
diff --git a/assets/fonts/Roboto-Regular.ttf b/assets/fonts/Roboto-Regular.ttf
diff --git a/assets/fonts/Roboto-Thin.ttf b/assets/fonts/Roboto-Thin.ttf
diff --git a/assets/fonts/Roboto-ThinItalic.ttf b/assets/fonts/Roboto-ThinItalic.ttf
diff --git a/assets/fonts/RobotoCondensed-Bold.ttf b/assets/fonts/RobotoCondensed-Bold.ttf
diff --git a/assets/fonts/RobotoCondensed-BoldItalic.ttf b/assets/fonts/RobotoCondensed-BoldItalic.ttf
diff --git a/assets/fonts/RobotoCondensed-Italic.ttf b/assets/fonts/RobotoCondensed-Italic.ttf
diff --git a/assets/fonts/RobotoCondensed-Regular.ttf b/assets/fonts/RobotoCondensed-Regular.ttf
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,24 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.5.+'
+    }
+}
+
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 17
+    buildToolsVersion '17.0.0'
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+}
diff --git a/src/com/devspark/robototextview/RobotoTypefaceManager.java b/src/com/devspark/robototextview/RobotoTypefaceManager.java
@@ -106,16 +106,16 @@ private static Typeface createTypeface(Context context, int typefaceValue) throw
                 typeface = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-BlackItalic.ttf");
                 break;
             case ROBOTO_CONDENSED:
-                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Condensed.ttf");
+                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/RobotoCondensed-Regular.ttf");
                 break;
             case ROBOTO_CONDENSED_ITALIC:
-                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-CondensedItalic.ttf");
+                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/RobotoCondensed-Italic.ttf");
                 break;
             case ROBOTO_CONDENSED_BOLD:
-                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-BoldCondensed.ttf");
+                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/RobotoCondensed-Bold.ttf");
                 break;
             case ROBOTO_CONDENSED_BOLD_ITALIC:
-                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-BoldCondensedItalic.ttf");
+                typeface = Typeface.createFromAsset(context.getAssets(), "fonts/RobotoCondensed-BoldItalic.ttf");
                 break;
             case ROBOTOSLAB_THIN:
                 typeface = Typeface.createFromAsset(context.getAssets(), "fonts/RobotoSlab-Thin.ttf");

diff --git a/src/com/devspark/robototextview/widget/RobotoMultiAutoCompleteTextView.java b/src/com/devspark/robototextview/widget/RobotoMultiAutoCompleteTextView.java
@@ -4,15 +4,17 @@
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
+import android.widget.MultiAutoCompleteTextView;
+
 import com.devspark.robototextview.R;
 import com.devspark.robototextview.RobotoTypefaceManager;
 
 /**
- * Implementation of a {@link RobotoAutoCompleteTextView} with native support for all the Roboto fonts.
+ * Implementation of a {@link MultiAutoCompleteTextView} with native support for all the Roboto fonts.
  *
  * @author e.shishkin
  */
-public class RobotoMultiAutoCompleteTextView extends RobotoAutoCompleteTextView {
+public class RobotoMultiAutoCompleteTextView extends MultiAutoCompleteTextView {
 
     /**
      * Simple constructor to use when creating a widget from code.