BetterAndroid/Hikage
5
0
Fork 0
mirror of https://github.com/BetterAndroid/Hikage.git synced 2025-09-05 10:15:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: merge to BetterAndroid new usage

Browse Source
This commit is contained in:
fankesyooni
2025-08-03 23:27:46 +08:00
parent 8990e03e97
commit ee97222bcb
15 changed files with 163 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hikage-core/src/main/java/com/highcapable/hikage/bypass/XmlBlockBypass.kt
View File

@@ -31,7 +31,7 @@ import android.content.res.loader.AssetsProvider
import android.content.res.loader.ResourcesProvider
import android.util.AttributeSet
import androidx.annotation.StyleRes
import com.highcapable.betterandroid.system.extension.tool.SystemVersion
import com.highcapable.betterandroid.system.extension.tool.AndroidVersion
import com.highcapable.betterandroid.ui.extension.view.inflateOrNull
import com.highcapable.betterandroid.ui.extension.view.layoutInflater
import com.highcapable.hikage.core.R
@@ -116,12 +116,12 @@ internal object XmlBlockBypass {
private val resolver = object : MemberProcessor.Resolver() {
override fun <T : Any> getDeclaredConstructors(declaringClass: Class<T>): List<Constructor<T>> =
SystemVersion.require(SystemVersion.P, super.getDeclaredConstructors(declaringClass)) {
AndroidVersion.require(AndroidVersion.P, super.getDeclaredConstructors(declaringClass)) {
HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Constructor<T>>().toList()
}
override fun <T : Any> getDeclaredMethods(declaringClass: Class<T>): List<Method> =
SystemVersion.require(SystemVersion.P, super.getDeclaredMethods(declaringClass)) {
AndroidVersion.require(AndroidVersion.P, super.getDeclaredMethods(declaringClass)) {
HiddenApiBypass.getDeclaredMethods(declaringClass).filterIsInstance<Method>().toList()
}
}
@@ -143,6 +143,7 @@ internal object XmlBlockBypass {
fun init(context: Context) {
// Context may be loaded from the preview and other non-Android platforms, ignoring this.
if (context.javaClass.name.endsWith("BridgeContext")) return
init(context.applicationContext.applicationInfo)
}
@@ -151,11 +152,12 @@ internal object XmlBlockBypass {
* @param info the application info.
*/
private fun init(info: ApplicationInfo) {
if (SystemVersion.isLowOrEqualsTo(SystemVersion.P)) return
if (AndroidVersion.isAtMost(AndroidVersion.P)) return
if (isInitOnce) return
val sourceDir = info.sourceDir
xmlBlock = when {
SystemVersion.isHighOrEqualsTo(SystemVersion.R) ->
AndroidVersion.isAtLeast(AndroidVersion.R) ->
// private static native long nativeLoad(@FormatType int format, @NonNull String path,
// @PropertyFlags int flags, @Nullable AssetsProvider asset) throws IOException;
ApkAssetsClass.resolve()
@@ -166,7 +168,7 @@ internal object XmlBlockBypass {
parameters(Int::class, String::class, Int::class, AssetsProvider::class)
modifiers(Modifiers.NATIVE)
}?.invokeQuietly(FORMAT_APK, sourceDir, PROPERTY_SYSTEM, null)
SystemVersion.isHighOrEqualsTo(SystemVersion.P) ->
AndroidVersion.isAtLeast(AndroidVersion.P) ->
// private static native long nativeLoad(
// @NonNull String path, boolean system, boolean forceSharedLib, boolean overlay)
// throws IOException;
@@ -180,18 +182,20 @@ internal object XmlBlockBypass {
}?.invokeQuietly(sourceDir, false, false, false)
else -> error("Unsupported Android version.")
} as? Long? ?: error("Failed to create ApkAssets.")
blockParser = XmlBlockClass.resolve()
.processor(resolver)
.optional()
.firstConstructorOrNull {
if (SystemVersion.isHighOrEqualsTo(36))
if (AndroidVersion.isAtLeast(AndroidVersion.BAKLAVA))
parameters(AssetManager::class, Long::class, Boolean::class)
else parameters(AssetManager::class, Long::class)
}?.let {
if (SystemVersion.isHighOrEqualsTo(36))
if (AndroidVersion.isAtLeast(AndroidVersion.BAKLAVA))
it.createQuietly(null, xmlBlock, false)
else it.createQuietly(null, xmlBlock)
} ?: error("Failed to create XmlBlock\$Parser.")
isInitOnce = true
}
@@ -208,8 +212,10 @@ internal object XmlBlockBypass {
*/
fun createViewAttrs() = context.layoutInflater.inflateOrNull<HikageAttrsView>(R.layout.layout_hikage_attrs_view)?.attrs
as? XmlResourceParser? ?: error("Failed to create AttributeSet.")
return if (SystemVersion.isHighOrEqualsTo(SystemVersion.P)) {
return if (AndroidVersion.isAtLeast(AndroidVersion.P)) {
if (!isInitOnce) return createViewAttrs()
require(blockParser != null) { "Hikage initialization failed." }
newParser?.copy()?.of(blockParser)
?.invokeQuietly<XmlResourceParser>(resId)

47
hikage-core/src/main/java/com/highcapable/hikage/core/Hikage.kt
View File

@@ -167,7 +167,9 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
if (parent != null && attachToParent) {
val parentId = generateRandomViewId()
provideView(parent, parentId)
}; newPerformer(lpClass, parent, attachToParent, context).apply(performer)
}
newPerformer(lpClass, parent, attachToParent, context).apply(performer)
}
/**
@@ -317,11 +319,13 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
*/
private fun <V : View> createView(viewClass: Class<V>, id: String?, context: Context): V {
val attrs = createAttributeSet(context)
val view = createViewFromFactory(viewClass, id, context, attrs) ?: getViewConstructor(viewClass)?.build(context, attrs)
if (view == null) throw PerformerException(
"Create view of type ${viewClass.name} failed. " +
"Please make sure the view class has a constructor with a single parameter of type Context."
)
provideView(view, id)
return view
}
@@ -334,16 +338,20 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
private fun <V : View> getViewConstructor(viewClass: Class<V>) =
viewConstructors[viewClass.name] as? ViewConstructor<V>? ?: run {
var parameterCount = 0
val twoParams = viewClass.resolve()
.optional(silent = true)
.firstConstructorOrNull { parameters(Context::class, AttributeSet::class) }
val onceParam = viewClass.resolve()
.optional(silent = true)
.firstConstructorOrNull { parameters(Context::class) }
val constructor = onceParam?.apply { parameterCount = 1 }
?: twoParams?.apply { parameterCount = 2 }
val viewConstructor = constructor?.let { ViewConstructor(it, parameterCount) }
if (viewConstructor != null) viewConstructors[viewClass.name] = viewConstructor
viewConstructor
}
@@ -358,15 +366,20 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
private fun <V : View> createViewFromFactory(viewClass: Class<V>, id: String?, context: Context, attrs: AttributeSet): V? {
val parent = performers.firstOrNull()?.parent
var processed: V? = null
factories.forEach { factory ->
val params = PerformerParams(id, attrs, viewClass as Class<View>)
val view = factory(parent, processed, context, params)
if (view != null && view.javaClass isNotSubclassOf viewClass) throw PerformerException(
"HikageFactory cannot cast the created view type \"${view.javaClass}\" to \"${viewClass.name}\", " +
"please confirm that the view type you created is correct."
)
if (view != null) processed = view as? V?
}; return processed
}
return processed
}
/**
@@ -379,6 +392,7 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
val (requireId, viewId) = generateViewId(id)
view.id = viewId
views[requireId] = view
return requireId
}
@@ -395,12 +409,16 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
*/
fun doGenerate(id: String): Int {
val generateId = View.generateViewId()
if (viewIds.contains(id)) throw PerformerException("View with id \"$id\" already exists.")
viewIds[id] = generateId
return generateId
}
val requireId = id ?: generateRandomViewId()
val viewId = doGenerate(requireId)
return requireId to viewId
}
@@ -456,6 +474,7 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
*/
internal inline fun requireNoPerformers(name: String, block: () -> Unit) {
val viewCount = views.size
block()
if (views.size != viewCount) throw PerformerException(
"Performers are not allowed to appear in $name DSL creation process."
@@ -472,13 +491,16 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
private fun include(delegate: Delegate<*>, context: Context, embedded: Boolean): Hikage {
val hikage = delegate.create(context)
if (!embedded) return hikage
val duplicateId = hikage.viewIds.toList().firstOrNull { (k, _) -> viewIds.containsKey(k) }?.first
if (duplicateId != null) throw PerformerException(
"Embedded layout view IDs conflict, the view id \"$duplicateId\" is already exists."
)
viewIds.putAll(hikage.viewIds)
views.putAll(hikage.views)
performers.addAll(hikage.performers)
return hikage
}
@@ -544,9 +566,11 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
val lpDelegate = LayoutParams.from(current, lpClass, parent, lparams)
val view = createView(classOf<V>(), id, context)
view.layoutParams = lpDelegate.create()
requireNoPerformers(classOf<V>().name) { view.init() }
startProvide(id, classOf<V>())
addToParentIfRequired(view)
return view
}
@@ -587,10 +611,12 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
val lpDelegate = LayoutParams.from(current, lpClass, parent, lparams)
val view = createView(classOf<VG>(), id, context)
view.layoutParams = lpDelegate.create()
requireNoPerformers(classOf<VG>().name) { view.init() }
startProvide(id, classOf<VG>())
addToParentIfRequired(view)
newPerformer<LP>(view).apply(performer)
return view
}
@@ -625,10 +651,12 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
id: String? = null
): View {
val view = context.layoutInflater.inflate(resId, parent, attachToRoot = false)
startProvide(id, view.javaClass, view)
lparams?.create()?.let { view.layoutParams = it }
provideView(view, id)
addToParentIfRequired(view)
return view
}
@@ -645,14 +673,17 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
): VB {
val viewBinding = ViewBinding<VB>().inflate(context.layoutInflater, parent, attachToParent = false)
val view = viewBinding.root
startProvide(id, view.javaClass, view)
if (view.parent != null) throw ProvideException(
"The ViewBinding($view) already has a parent, " +
"it may have been created using layout root node <merge> or <include>, cannot be provided."
)
lparams?.create()?.let { view.layoutParams = it }
provideView(view, id)
addToParentIfRequired(view)
return viewBinding
}
@@ -670,11 +701,14 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
id: String? = null
): View {
if (view.parent != null) throw ProvideException("The view $view already has a parent, cannot be provided.")
startProvide(id, view.javaClass, view)
val lpDelegate = LayoutParams.from(current = this@Hikage, lpClass, parent, lparams, view.layoutParams)
view.layoutParams = lpDelegate.create()
provideView(view, id)
addToParentIfRequired(view)
return view
}
@@ -708,13 +742,17 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
): Hikage {
val view = hikage.root
startProvide(id, view.javaClass, view)
val lpDelegate = LayoutParams.from(current = this@Hikage, lpClass, parent, lparams, view.layoutParams)
if (view.parent != null) throw ProvideException(
"The Hikage layout root view $view already has a parent, cannot be provided."
)
view.layoutParams = lpDelegate.create()
provideView(view, id)
addToParentIfRequired(view)
return hikage
}
@@ -783,6 +821,7 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
*/
private fun <V : View> startProvide(id: String?, viewClass: Class<V>, view: V? = null) {
provideCount++
if (provideCount > 1 && (parent == null || !attachToParent)) throw ProvideException(
"Provide view ${view?.javaClass ?: viewClass}(${id?.let { "\"$it\""} ?: "<anonymous>"}) failed. ${
if (parent == null) "No parent view group found"
@@ -900,6 +939,7 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
superclass()
}?.invokeQuietly<ViewGroup.LayoutParams>(it)
} ?: lparams
return wrapped
// Build a default.
?: lpClass.createInstanceOrNull(LayoutParamsWrapContent, LayoutParamsWrapContent)
@@ -912,12 +952,15 @@ class Hikage private constructor(private val factories: List<HikageFactory>) {
*/
fun create(): ViewGroup.LayoutParams {
if (bodyBuilder == null && wrapperBuilder == null) throw PerformerException("No layout params builder found.")
return bodyBuilder?.let {
val lparams = ViewLayoutParams(lpClass, it.width, it.height, it.matchParent, it.widthMatchParent, it.heightMatchParent)
current.requireNoPerformers(lparams.javaClass.name) { it.body(lparams) }
lparams
} ?: wrapperBuilder?.let {
val lparams = it.delegate?.create() ?: it.lparams
createDefaultLayoutParams(lparams)
} ?: throw PerformerException("Internal error of build layout params.")
}

1
hikage-core/src/main/java/com/highcapable/hikage/core/preview/HikagePreview.kt
View File

@@ -47,6 +47,7 @@ abstract class HikagePreview(context: Context, attrs: AttributeSet? = null) : Fr
@CallSuper
override fun onAttachedToWindow() {
super.onAttachedToWindow()
removeAllViews()
build().create(context, parent = this)
}