Add @UiThread annotation to applies and builders

airbnb · Sep 2, 2017 · 3695c72 · 3695c72
1 parent 6c4124e
commit 3695c72
Show file tree

Hide file tree

Showing 7 changed files with 782 additions and 711 deletions.
diff --git a/paris-processor/src/main/java/com/airbnb/paris/processor/StyleAppliersWriter.kt b/paris-processor/src/main/java/com/airbnb/paris/processor/StyleAppliersWriter.kt
@@ -10,13 +10,8 @@ import javax.annotation.processing.*
 import javax.lang.model.element.*
 import javax.lang.model.type.*
 import javax.lang.model.util.*
-import kotlin.Boolean
-import kotlin.String
-import kotlin.apply
 import kotlin.check
-import kotlin.let
 
-// TODO  Add @UiThread annotation to StyleApplier classes
 internal object StyleAppliersWriter {
 
     val styleablesTree = StyleablesTree()
@@ -40,6 +35,7 @@ internal object StyleAppliersWriter {
         val styleApplierClassName = styleableInfo.styleApplierClassName()
 
         val styleTypeBuilder = TypeSpec.classBuilder(styleApplierClassName)
+                .addAnnotation(ClassNames.ANDROID_UI_THREAD)
                 .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
                 .superclass(ParameterizedTypeName.get(ParisProcessor.STYLE_APPLIER_CLASS_NAME, TypeName.get(styleableInfo.elementType), TypeName.get(styleableInfo.viewElementType)))
                 .addMethod(buildConstructorMethod(styleableInfo))
@@ -297,6 +293,7 @@ internal object StyleAppliersWriter {
         // StyleBuilder inner class
         val styleBuilderClassName = styleApplierClassName.nestedClass("StyleBuilder")
         val styleBuilderTypeBuilder = TypeSpec.classBuilder(styleBuilderClassName)
+                .addAnnotation(ClassNames.ANDROID_UI_THREAD)
                 .addModifiers(Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
                 .superclass(ParameterizedTypeName.get(baseClassName, styleBuilderClassName, styleApplierClassName))
                 .addMethod(buildStyleBuilderApplierConstructorMethod(styleApplierClassName))
@@ -338,10 +335,10 @@ internal object StyleAppliersWriter {
             StyleInfo.Kind.FIELD -> builder.addStatement("add(\$T.\$L)", styleInfo.enclosingElement, styleInfo.elementName)
             StyleInfo.Kind.METHOD -> {
                 builder
-                        .addStatement("consumeSimpleStyleBuilder()")
+                        .addStatement("consumeProgrammaticStyleBuilder()")
                         .addStatement("debugName(\$S)", styleInfo.formattedName)
                         .addStatement("\$T.\$L(this)", styleInfo.enclosingElement, styleInfo.elementName)
-                        .addStatement("consumeSimpleStyleBuilder()")
+                        .addStatement("consumeProgrammaticStyleBuilder()")
             }
             StyleInfo.Kind.STYLE_RES -> {
                 builder.addStatement("add(\$L)", styleInfo.styleResourceCode)

diff --git a/paris-processor/src/main/java/com/airbnb/paris/processor/utils/ClassNames.kt b/paris-processor/src/main/java/com/airbnb/paris/processor/utils/ClassNames.kt
@@ -17,4 +17,5 @@ internal object ClassNames {
     val ANDROID_INTEGER_RES = "android.support.annotation.IntegerRes".className()
     val ANDROID_STRING_RES = "android.support.annotation.StringRes".className()
     val ANDROID_STYLE_RES = "android.support.annotation.StyleRes".className()
+    val ANDROID_UI_THREAD = "android.support.annotation.UiThread".className()
 }