aa

annotations/.gitignore

@@ -0,0 +1 @@
+/build

annotations/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("java-library")
+    id("org.jetbrains.kotlin.jvm")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

annotations/src/main/java/ceui/lisa/annotations/ItemHolder.kt

@@ -0,0 +1,8 @@
+package ceui.lisa.annotations
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@MustBeDocumented
+annotation class ItemHolder(val itemHolderCls: KClass<*>)

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "ceui.lisa.pixiv"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 272
-        versionName "3.3.9"
+        versionCode 280
+        versionName "3.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -126,6 +126,9 @@ dependencies {
     api 'io.reactivex.rxjava2:rxjava:2.2.21'
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
+    implementation(project(":annotations")) // 1
+    implementation(project(":processor")) // 2
+    kapt(project(":processor")) // 3
 
     implementation 'com.github.bumptech.glide:glide:4.14.2'
     kapt 'com.github.bumptech.glide:compiler:4.14.2'

app/src/main/AndroidManifest.xml

@@ -188,7 +188,6 @@
         </activity>
         <activity android:name=".activities.VPActivity" />
         <activity android:name=".activities.NovelActivity" />
-        <activity android:name=".jetpack.NavActivity" />
 
         <receiver
             android:name=".notification.RecommendAppWidgetProvider"

app/src/main/java/ceui/lisa/activities/MainActivity.java

@@ -41,7 +41,6 @@
 import ceui.lisa.fragments.FragmentViewPager;
 import ceui.lisa.helper.DrawerLayoutHelper;
 import ceui.lisa.helper.NavigationLocationHelper;
-import ceui.lisa.jetpack.NavActivity;
 import ceui.lisa.utils.Common;
 import ceui.lisa.utils.Dev;
 import ceui.lisa.utils.GlideUtil;

app/src/main/java/ceui/lisa/http/AppApi.java

@@ -240,11 +240,11 @@ Observable<ListUser> getWhoFollowThisUser(@Header("Authorization") String token,
                                               @Query("user_id") int user_id);
 
 
-    @GET("v1/illust/comments")
+    @GET("/v3/illust/comments")
     Observable<ListComment> getIllustComment(@Header("Authorization") String token,
                                              @Query("illust_id") int illust_id);
 
-    @GET("v1/novel/comments")
+    @GET("v3/novel/comments")
     Observable<ListComment> getNovelComment(@Header("Authorization") String token,
                                        @Query("novel_id") int novel_id);
 

app/src/main/java/ceui/loxia/KeyedViewModel.kt

@@ -0,0 +1,83 @@
+package ceui.loxia
+
+import androidx.annotation.MainThread
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.HasDefaultViewModelProviderFactory
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.viewmodel.CreationExtras
+import kotlin.reflect.KClass
+
+
+
+@MainThread
+public inline fun <reified VM : ViewModel> Fragment.keyedViewModels(
+    noinline keyPrefixProvider: ()->String,
+    noinline ownerProducer: () -> ViewModelStoreOwner = { this },
+    noinline extrasProducer: (() -> CreationExtras)? = null,
+    noinline factoryProducer: (() -> ViewModelProvider.Factory)? = null
+): Lazy<VM> {
+    val owner by lazy(LazyThreadSafetyMode.NONE) { ownerProducer() }
+    return keyedCreateViewModelLazy(
+        keyPrefixProvider,
+        VM::class,
+        { owner.viewModelStore },
+        {
+            extrasProducer?.invoke()
+                ?: (owner as? HasDefaultViewModelProviderFactory)?.defaultViewModelCreationExtras
+                ?: CreationExtras.Empty
+        },
+        factoryProducer ?: {
+            (owner as? HasDefaultViewModelProviderFactory)?.defaultViewModelProviderFactory
+                ?: defaultViewModelProviderFactory
+        })
+}
+
+@MainThread
+public fun <VM : ViewModel> Fragment.keyedCreateViewModelLazy(
+    keyPrefixProvider: ()->String,
+    viewModelClass: KClass<VM>,
+    storeProducer: () -> ViewModelStore,
+    extrasProducer: () -> CreationExtras = { defaultViewModelCreationExtras },
+    factoryProducer: (() -> ViewModelProvider.Factory)? = null
+
+): Lazy<VM> {
+    val factoryPromise = factoryProducer ?: {
+        defaultViewModelProviderFactory
+    }
+    return KeyedViewModelLazy(keyPrefixProvider, viewModelClass, storeProducer, factoryPromise, extrasProducer)
+}
+
+public class KeyedViewModelLazy<VM : ViewModel> @JvmOverloads constructor(
+    private val keyPrefixProvider: ()->String,
+    private val viewModelClass: KClass<VM>,
+    private val storeProducer: () -> ViewModelStore,
+    private val factoryProducer: () -> ViewModelProvider.Factory,
+    private val extrasProducer: () -> CreationExtras = { CreationExtras.Empty }
+) : Lazy<VM> {
+    private var cached: VM? = null
+
+    override val value: VM
+        get() {
+            val viewModel = cached
+            return if (viewModel == null) {
+                val factory = factoryProducer()
+                val store = storeProducer()
+                val canonicalName: String = viewModelClass.java.canonicalName
+                    ?: throw IllegalArgumentException("Local and anonymous classes can not be ViewModels")
+                ViewModelProvider(
+                    store,
+                    factory,
+                    extrasProducer()
+                ).get("${keyPrefixProvider()} : $canonicalName", viewModelClass.java).also {
+                    cached = it
+                }
+            } else {
+                viewModel
+            }
+        }
+
+    override fun isInitialized(): Boolean = cached != null
+}

app/src/main/java/ceui/loxia/NavFragment.kt

@@ -10,6 +10,9 @@ import ceui.lisa.R
 
 open class NavFragment(layoutId: Int) : Fragment(layoutId)
 
+interface ActionReceiver {
+}
+
 abstract class SlinkyListFragment(layoutId: Int = R.layout.fragment_slinky_list) : NavFragment(layoutId) {
 
     open fun isDefaultLayoutManager(): Boolean {

app/src/main/java/ceui/loxia/SpaceHolder.kt

@@ -1,12 +1,14 @@
 package ceui.loxia
 
+import ceui.lisa.annotations.ItemHolder
 import ceui.lisa.databinding.CellSpaceBinding
 import ceui.refactor.ListItemHolder
 import ceui.refactor.ListItemViewHolder
 
 class SpaceHolder : ListItemHolder() {
 }
 
+@ItemHolder(SpaceHolder::class)
 class SpaceViewHolder(private val bd: CellSpaceBinding) : ListItemViewHolder<CellSpaceBinding, SpaceHolder>(bd) {
 
     override fun onBindViewHolder(holder: SpaceHolder, position: Int) {

app/src/main/java/ceui/loxia/TextDescHolder.kt

@@ -1,5 +1,6 @@
 package ceui.loxia
 
+import ceui.lisa.annotations.ItemHolder
 import ceui.lisa.databinding.CellSpaceBinding
 import ceui.lisa.databinding.CellTextDescBinding
 import ceui.refactor.ListItemHolder
@@ -8,6 +9,7 @@ import ceui.refactor.ListItemViewHolder
 class TextDescHolder(val content: String) : ListItemHolder() {
 }
 
+@ItemHolder(TextDescHolder::class)
 class TextDescViewHolder(private val bd: CellTextDescBinding) : ListItemViewHolder<CellTextDescBinding, TextDescHolder>(bd) {
 
     override fun onBindViewHolder(holder: TextDescHolder, position: Int) {

app/src/main/java/ceui/loxia/UIAction.kt

@@ -0,0 +1,68 @@
+package ceui.loxia
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.findFragment
+import kotlin.reflect.KClass
+
+inline fun<reified InterfaceT> Fragment.sendAction(action: (receiver: InterfaceT)->Boolean) {
+    var received = false
+    var itr: Fragment? = this
+    while (itr != null) {
+        val receiver = itr as? InterfaceT
+        if (receiver != null  && action(receiver)) {
+            received = true
+            break
+        } else {
+            itr = itr.parentFragment
+        }
+    }
+
+    if (!received) {
+        val receiver = this.activity as? InterfaceT
+        if (receiver != null) {
+            action(receiver)
+        }
+    }
+}
+
+inline fun<reified InterfaceT> View.sendAction(action: (receiver: InterfaceT)->Boolean) {
+    val fragment = this.findFragment<Fragment>()
+    fragment.sendAction<InterfaceT>(action)
+}
+
+inline fun <reified ActionReceiverT> Fragment.findActionReceiverOrNull(): ActionReceiverT? {
+    var itr: Fragment? = this
+    while (itr != null) {
+        val receiver = itr as? ActionReceiverT
+        if (receiver != null) {
+            return receiver
+        } else {
+            itr = itr.parentFragment
+        }
+    }
+
+    return activity as? ActionReceiverT
+}
+
+
+inline fun<reified ActionReceiverT> View.findActionReceiverOrNull(): ActionReceiverT? {
+    val fragment = this.findFragmentOrNull<Fragment>()
+    return fragment?.findActionReceiverOrNull<ActionReceiverT>()
+}
+
+inline fun<reified ActionReceiverT> View.findActionReceiver(): ActionReceiverT {
+    val fragment = this.findFragment<Fragment>()
+    return fragment.findActionReceiverOrNull<ActionReceiverT>()!!
+}
+
+inline fun <reified F : Fragment> View.findFragmentOrNull(): F? {
+    return try {
+        val targetFragment = findFragment<Fragment>()
+        if (targetFragment is F) {
+            targetFragment as F
+        } else null
+    } catch (e: Exception) {
+        null
+    }
+}

app/src/main/java/ceui/loxia/flag/FlagReasonFragment.kt

@@ -10,7 +10,7 @@ import ceui.lisa.databinding.FragmentSlinkyListBinding
 import ceui.loxia.*
 import ceui.refactor.viewBinding
 
-class FlagReasonFragment : SlinkyListFragment() {
+class FlagReasonFragment : SlinkyListFragment(), FlagActionReceiver {
 
     private val binding by viewBinding(FragmentSlinkyListBinding::bind)
     private val safeArgs by threadSafeArgs<FlagReasonFragmentArgs>()
@@ -27,15 +27,6 @@ class FlagReasonFragment : SlinkyListFragment() {
         setUpSlinkyList(binding.listView, binding.refreshLayout, binding.itemLoading, viewModel)
     }
 
-    fun onHolderClick(holder: FlagReasonHolder) {
-        startActivity(Intent(requireContext(), TemplateActivity::class.java).apply {
-            putExtra(TemplateActivity.EXTRA_FRAGMENT, "填写举报详细信息")
-            putExtra(FlagDescFragment.FlagReasonIdKey, holder.id)
-            putExtra(FlagDescFragment.FlagObjectIdKey, safeArgs.flagObjectId)
-            putExtra(FlagDescFragment.FlagObjectTypeKey, safeArgs.flagObjectType)
-        })
-    }
-
     companion object {
         fun newInstance(flagObjectId: Int, flagObjectType: Int): FlagReasonFragment {
             val fragment = FlagReasonFragment()
@@ -56,4 +47,13 @@ class FlagReasonFragment : SlinkyListFragment() {
             requireActivity().finish()
         }
     }
+
+    override fun onClickFlag(holder: FlagReasonHolder) {
+        startActivity(Intent(requireContext(), TemplateActivity::class.java).apply {
+            putExtra(TemplateActivity.EXTRA_FRAGMENT, "填写举报详细信息")
+            putExtra(FlagDescFragment.FlagReasonIdKey, holder.id)
+            putExtra(FlagDescFragment.FlagObjectIdKey, safeArgs.flagObjectId)
+            putExtra(FlagDescFragment.FlagObjectTypeKey, safeArgs.flagObjectType)
+        })
+    }
 }

app/src/main/java/ceui/loxia/flag/FlagReasonRepository.kt

@@ -1,12 +1,15 @@
 package ceui.loxia.flag
 
 import ceui.lisa.R
+import ceui.lisa.annotations.ItemHolder
 import ceui.lisa.databinding.CellFlagReasonBinding
 import ceui.loxia.RefreshState
 import ceui.loxia.Repository
+import ceui.loxia.findActionReceiverOrNull
+import ceui.loxia.findFragmentOrNull
+import ceui.loxia.novel.NovelTextHolder
 import ceui.refactor.ListItemHolder
 import ceui.refactor.ListItemViewHolder
-import ceui.refactor.findFragmentOrNull
 import ceui.refactor.setOnClick
 
 class FlagReasonRepository : Repository<FlagReasonFragment>() {
@@ -51,13 +54,18 @@ class FlagReasonHolder(val id: Int, val content: String, val key: String) : List
     }
 }
 
+@ItemHolder(FlagReasonHolder::class)
 class FlagReasonViewHolder(binding: CellFlagReasonBinding) :
     ListItemViewHolder<CellFlagReasonBinding, FlagReasonHolder>(binding) {
 
     override fun onBindViewHolder(holder: FlagReasonHolder, position: Int) {
         binding.flagReasonTv.text = holder.content
         binding.root.setOnClick {
-            it.findFragmentOrNull<FlagReasonFragment>()?.onHolderClick(holder)
+            it.findActionReceiverOrNull<FlagActionReceiver>()?.onClickFlag(holder)
         }
     }
+}
+
+interface FlagActionReceiver {
+    fun onClickFlag(holder: FlagReasonHolder)
 }