Refactor Calligraphy into a ViewPump interceptor

CalligraphySample/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.0"
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 14
         targetSdkVersion 24
         versionCode project.ext.versionCodeInt
         versionName version
@@ -24,6 +24,7 @@ android {
 
 dependencies {
     compile project(':calligraphy')
+    compile 'io.github.inflationx:viewpump:0.1.0-SNAPSHOT'
     compile 'com.android.support:support-v4:24.0.0'
     compile 'com.android.support:appcompat-v7:24.0.0'
 

CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/CalligraphyApplication.java

@@ -2,7 +2,9 @@
 
 import android.app.Application;
 
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
+import io.github.inflationx.viewpump.ViewPump;
+import uk.co.chrisjenx.calligraphy3.CalligraphyConfig;
+import uk.co.chrisjenx.calligraphy3.CalligraphyInterceptor;
 
 /**
  * Created by chris on 06/05/2014.
@@ -13,12 +15,14 @@ public class CalligraphyApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
-                .setDefaultFontPath("fonts/Roboto-ThinItalic.ttf")
-                .setFontAttrId(R.attr.fontPath)
-                .addCustomViewWithSetTypeface(CustomViewWithTypefaceSupport.class)
-                .addCustomStyle(TextField.class, R.attr.textFieldStyle)
-                .build()
-        );
+        ViewPump.init(ViewPump.builder()
+                .addInterceptor(new CalligraphyInterceptor(
+                        new CalligraphyConfig.Builder()
+                                .setDefaultFontPath("fonts/Roboto-ThinItalic.ttf")
+                                .setFontAttrId(R.attr.fontPath)
+                                .addCustomViewWithSetTypeface(CustomViewWithTypefaceSupport.class)
+                                .addCustomStyle(TextField.class, R.attr.textFieldStyle)
+                                .build()))
+                .build());
     }
 }

CalligraphySample/src/main/java/uk/co/chrisjenx/calligraphy/sample/MainActivity.java

@@ -7,7 +7,7 @@
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
+import io.github.inflationx.viewpump.ViewPumpContextWrapper;
 
 import static butterknife.ButterKnife.findById;
 
@@ -52,17 +52,17 @@ public void run() {
     }
 
     /*
-        Uncomment if you disable PrivateFactory injection. See CalligraphyConfig#disablePrivateFactoryInjection()
+        Uncomment if you disable PrivateFactory injection. See ViewPumpConfig#setPrivateFactoryInjectionEnabled(boolean)
      */
 //    @Override
 //    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
 //    public View onCreateView(View parent, String name, @NonNull Context context, @NonNull AttributeSet attrs) {
-//        return CalligraphyContextWrapper.onActivityCreateView(this, parent, super.onCreateView(parent, name, context, attrs), name, context, attrs);
+//        return ViewPumpContextWrapper.onActivityCreateView(this, parent, super.onCreateView(parent, name, context, attrs), name, context, attrs);
 //    }
 
     @Override
     protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
+        super.attachBaseContext(ViewPumpContextWrapper.wrap(newBase));
     }
 
 }

build.gradle

@@ -10,6 +10,7 @@ buildscript {
 
 allprojects {
   repositories {
+    mavenLocal()
     jcenter()
   }
   // Is Release Build?

calligraphy/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.0"
 
     defaultConfig {
-        minSdkVersion 7
+        minSdkVersion 14
         targetSdkVersion 24
         versionCode project.ext.versionCodeInt
         versionName version
@@ -21,6 +21,7 @@ android {
 }
 
 dependencies {
+    compile 'io.github.inflationx:viewpump:0.1.1-SNAPSHOT'
     compile 'com.android.support:appcompat-v7:24.0.0'
 }
 

calligraphy/consumer-proguard-rules.txt

@@ -16,6 +16,6 @@
 #   public *;
 #}
 
--keep class uk.co.chrisjenx.calligraphy.* { *; }
--keep class uk.co.chrisjenx.calligraphy.*$* { *; }
+-keep class uk.co.chrisjenx.calligraphy3.* { *; }
+-keep class uk.co.chrisjenx.calligraphy3.*$* { *; }
 

calligraphy/gradle.properties

@@ -2,5 +2,5 @@
 # See parent properties for global properties
 
 POM_NAME=Calligraphy
-POM_ARTIFACT_ID=calligraphy
+POM_ARTIFACT_ID=calligraphy3
 POM_PACKAGING=aar

calligraphy/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="uk.co.chrisjenx.calligraphy">
+    package="uk.co.chrisjenx.calligraphy3">
     <application />
 </manifest>