Merge pull request #127 from AlanCheen/feature/deprecate_annotaion

暂时移除 annotation 的方式
AlanCheen · Nov 3, 2022 · 38b057a · 38b057a
2 parents 725bae9 + 3b09ae4
commit 38b057a
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 216 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -98,15 +98,14 @@ dependencies {
 
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 
-    implementation project(':ktmodule')
 
     implementation project(':flap')
     implementation project(':flap-animation')
     implementation project(':flap-dsl-viewbinding')
     implementation project(':flap-dsl-databinding')
-    implementation project(':flap-annotations')
+//    implementation project(':flap-annotations')
 //    implementation project(':flap-gradle-plugin')
-    kapt project(':flap-compiler')
+//    kapt project(':flap-compiler')
 
     implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
 //    implementation 'com.google.code.gson:gson:2.9.1'

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/FlapApplication.kt b/app/src/main/java/me/yifeiyuan/flapdev/FlapApplication.kt
@@ -8,7 +8,6 @@ import androidx.multidex.MultiDexApplication
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import me.yifeiyuan.flap.Flap
-import me.yifeiyuan.flap.apt.delegates.*
 import me.yifeiyuan.flap.dsl.adapterHook
 import me.yifeiyuan.flap.hook.LoggingHook
 import me.yifeiyuan.flapdev.components.*
@@ -80,12 +79,11 @@ class FlapApplication : MultiDexApplication() {
                     SimpleTextComponentDelegate(),
                     createCustomViewTypeComponentDelegate(),
                     createViewBindingDelegate(),
-                    KtModuleComponentAdapterDelegate(),
-                    TestClickComponentAdapterDelegate(),
+                    createTestClickDelegate(),
                     createZeroHeightComponentDelegate(),
                     createTestAdapterApiComponentDelegate(),
-                    DataBindingComponentAdapterDelegate(),
-                    DiffComponentAdapterDelegate(),
+                    createDataBindingDelegate(),
+                    createDiffDelegate(),
             )
 
             //也是全局

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/Mocks.kt b/app/src/main/java/me/yifeiyuan/flapdev/Mocks.kt
@@ -4,7 +4,6 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import me.yifeiyuan.flap.ext.SwipeDragHelper.Companion.FLAG_ALL_DIRECTIONS
 import me.yifeiyuan.flap.ext.SwipeDragHelper.Companion.FLAG_LEFT_AND_RIGHT
 import me.yifeiyuan.flap.ext.SwipeDragHelper.Companion.FLAG_UP_AND_DOWN
-import me.yifeiyuan.flap.ktmodule.KtComponentModel
 import me.yifeiyuan.flapdev.components.*
 import me.yifeiyuan.flapdev.components.SimpleDataBindingModel
 import me.yifeiyuan.flapdev.components.ViewBindingModel
@@ -34,7 +33,6 @@ fun mockMultiTypeModels(): MutableList<Any> {
     models.addAll(mockFullFeatureModels())
     models.add(CustomViewTypeModel())
     models.add(SimpleDataBindingModel())
-    models.add(KtComponentModel())
     models.add(ViewBindingModel())
     models.add(UnknownModel())
     return models

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/DataBindingComponent.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/DataBindingComponent.kt
@@ -1,7 +1,5 @@
 package me.yifeiyuan.flapdev.components
 
-import me.yifeiyuan.flap.Component
-import me.yifeiyuan.flap.annotations.Delegate
 import me.yifeiyuan.flap.dsl.databinding.adapterDelegateDataBinding
 import me.yifeiyuan.flapdev.R
 import me.yifeiyuan.flapdev.databinding.FlapItemSimpleDatabindingBinding
@@ -17,15 +15,15 @@ class SimpleDataBindingModel {
     var text = "使用 DataBinding 的 Component"
 }
 
-@Delegate(layoutName = "flap_item_simple_databinding", useDataBinding = true)
-class DataBindingComponent(private var binding: FlapItemSimpleDatabindingBinding) : Component<SimpleDataBindingModel>(binding.root) {
-
-    override fun onBind(model: SimpleDataBindingModel) {
-        binding.model = model
-        binding.executePendingBindings()
-    }
-
-}
+//@Delegate(layoutName = "flap_item_simple_databinding", useDataBinding = true)
+//class DataBindingComponent(private var binding: FlapItemSimpleDatabindingBinding) : Component<SimpleDataBindingModel>(binding.root) {
+//
+//    override fun onBind(model: SimpleDataBindingModel) {
+//        binding.model = model
+//        binding.executePendingBindings()
+//    }
+//
+//}
 
 //DSL 的方式
 fun createDataBindingDelegate() = adapterDelegateDataBinding<SimpleDataBindingModel, FlapItemSimpleDatabindingBinding>(R.layout.flap_item_simple_databinding) {

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/DiffComponent.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/DiffComponent.kt
@@ -1,13 +1,8 @@
 package me.yifeiyuan.flapdev.components
 
 import android.os.SystemClock
-import android.view.View
-import android.widget.Button
-import me.yifeiyuan.flap.Component
-import me.yifeiyuan.flap.FlapAdapter
-import me.yifeiyuan.flap.annotations.Delegate
-import me.yifeiyuan.flap.delegate.AdapterDelegate
 import me.yifeiyuan.flap.differ.IDiffer
+import me.yifeiyuan.flap.dsl.adapterDelegate
 import me.yifeiyuan.flap.ext.bindButton
 import me.yifeiyuan.flap.ext.bindTextView
 import me.yifeiyuan.flapdev.R
@@ -43,13 +38,8 @@ class TestDiffModel(var content: String, var id: Int, var desc: String) : IDiffe
     }
 }
 
-@Delegate(layoutId = R.layout.component_diff)
-class DiffComponent(view: View) : Component<TestDiffModel>(view) {
-
-    override fun onBind(model: TestDiffModel) {
-    }
-
-    override fun onBind(model: TestDiffModel, position: Int, payloads: List<Any>, adapter: FlapAdapter, delegate: AdapterDelegate<*, *>) {
+fun createDiffDelegate() = adapterDelegate<TestDiffModel>(R.layout.component_diff) {
+    onBind { model, position, payloads, adapter ->
 
         //当 payloads 更新时，事件点击需要重新设置
         bindButton(R.id.modifyContent) {

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/SimpleTextComponent.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/SimpleTextComponent.kt
@@ -3,13 +3,11 @@ package me.yifeiyuan.flapdev.components
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewTreeObserver
 import android.widget.TextView
-import me.yifeiyuan.flap.delegate.AdapterDelegate
 import me.yifeiyuan.flap.Component
 import me.yifeiyuan.flap.FlapAdapter
 import me.yifeiyuan.flap.ViewTypeGenerator
-import me.yifeiyuan.flap.annotations.Delegate
+import me.yifeiyuan.flap.delegate.AdapterDelegate
 import me.yifeiyuan.flapdev.Logger
 import me.yifeiyuan.flapdev.R
 
@@ -26,7 +24,7 @@ data class SimpleTextModel(val content: String){
 }
 
 //@Delegate(layoutName = "flap_item_simple_text")
-@Delegate(layoutId = R.layout.flap_item_simple_text)
+//@Delegate(layoutId = R.layout.flap_item_simple_text)
 class SimpleTextComponent(itemView: View) : Component<SimpleTextModel>(itemView) {
 
     private val tvContent: TextView = findViewById(R.id.tv_content)

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/TestAdapterApiComponent.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/TestAdapterApiComponent.kt
@@ -1,18 +1,12 @@
 package me.yifeiyuan.flapdev.components
 
 import android.util.Log
-import android.view.View
 import android.widget.TextView
-import me.yifeiyuan.flap.Component
-import me.yifeiyuan.flap.FlapAdapter
-import me.yifeiyuan.flap.annotations.Delegate
-import me.yifeiyuan.flap.delegate.AdapterDelegate
 import me.yifeiyuan.flap.dsl.adapterDelegate
 import me.yifeiyuan.flap.event.Event
 import me.yifeiyuan.flap.ext.bindButton
-import me.yifeiyuan.flapdev.TestService
 import me.yifeiyuan.flapdev.R
-import kotlin.text.StringBuilder
+import me.yifeiyuan.flapdev.TestService
 
 /**
  * Created by 程序亦非猿 on 2022/7/29.

diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/TestClickComponent.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/TestClickComponent.kt
@@ -1,8 +1,6 @@
 package me.yifeiyuan.flapdev.components
 
-import android.view.View
-import me.yifeiyuan.flap.Component
-import me.yifeiyuan.flap.annotations.Delegate
+import me.yifeiyuan.flap.dsl.adapterDelegate
 import me.yifeiyuan.flap.ext.bindTextView
 import me.yifeiyuan.flapdev.R
 
@@ -13,9 +11,8 @@ import me.yifeiyuan.flapdev.R
 
 class TestClickModel(var content: String)
 
-@Delegate(layoutId = R.layout.component_test_click)
-class TestClickComponent(itemView: View) : Component<TestClickModel>(itemView) {
-    override fun onBind(model: TestClickModel) {
+fun createTestClickDelegate() = adapterDelegate<TestClickModel>(R.layout.component_test_click) {
+    onBind { model, position, payloads, adapter ->
         bindTextView(R.id.clicks){
             text = model.content
         }

diff --git a/ktmodule/.gitignore b/ktmodule/.gitignore
diff --git a/ktmodule/build.gradle b/ktmodule/build.gradle
diff --git a/ktmodule/consumer-rules.pro b/ktmodule/consumer-rules.pro
diff --git a/ktmodule/proguard-rules.pro b/ktmodule/proguard-rules.pro
diff --git a/ktmodule/src/androidTest/java/me/yifeiyuan/flap/ktmodule/ExampleInstrumentedTest.kt b/ktmodule/src/androidTest/java/me/yifeiyuan/flap/ktmodule/ExampleInstrumentedTest.kt
diff --git a/ktmodule/src/main/AndroidManifest.xml b/ktmodule/src/main/AndroidManifest.xml
diff --git a/ktmodule/src/main/java/me/yifeiyuan/flap/ktmodule/KtModuleComponent.kt b/ktmodule/src/main/java/me/yifeiyuan/flap/ktmodule/KtModuleComponent.kt
diff --git a/ktmodule/src/main/res/layout/kt_module_component.xml b/ktmodule/src/main/res/layout/kt_module_component.xml
diff --git a/ktmodule/src/test/java/me/yifeiyuan/flap/ktmodule/ExampleUnitTest.kt b/ktmodule/src/test/java/me/yifeiyuan/flap/ktmodule/ExampleUnitTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1,9 +1,8 @@
 include ':flap-animation'
 include ':flap-dsl-databinding'
 include ':flap-dsl-viewbinding'
-include ':ktmodule'
 //include ':flap-gradle-plugin'
 include ':app'
 include ':flap'
-include ':flap-annotations'
-include ':flap-compiler'
+//include ':flap-annotations'
+//include ':flap-compiler'