Merge pull request #60 from Petterpx/fix_gravity_disorderly

fix:修复gravity移除逻辑

Author: Petterpx

app/build.gradle

@@ -49,8 +49,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation project(path: ':floatingx')
     implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1"
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
+    implementation isDev ? project(path: ':floatingx') : "com.github.Petterpx:FloatingX:$version_name"
 }

app/src/main/java/com/petterp/floatingx/app/MainActivity.kt

@@ -13,7 +13,7 @@ import com.petterp.floatingx.util.createFx
 
 class MainActivity : AppCompatActivity() {
 
-    private lateinit var viewGroup: ViewGroup
+    private lateinit var viewGroup: FrameLayout
 
     private val activityFx by createFx {
         setLayout(R.layout.item_floating)
@@ -31,7 +31,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         createLinearLayoutToParent {
-            viewGroup = addScopeViewGroup()
+            viewGroup = addScopeFrameViewGroup()
             addItemView("隐藏全局悬浮窗") {
                 FloatingX.control().hide()
             }
@@ -92,7 +92,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun ViewGroup.addScopeViewGroup(): ViewGroup {
+    private fun ViewGroup.addScopeFrameViewGroup(): FrameLayout {
         val viewGroup = FrameLayout(context).apply {
             layoutParams = FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT,

app/src/main/java/com/petterp/floatingx/app/ScopeActivity.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import com.petterp.floatingx.app.simple.FxAnimationImpl
+import com.petterp.floatingx.assist.FxGravity
 import com.petterp.floatingx.util.createFx
 
 /** @author petterp */
@@ -32,6 +33,7 @@ class ScopeActivity : AppCompatActivity() {
         setLayout(R.layout.item_floating)
         setEnableScrollOutsideScreen(false)
         setEnableEdgeAdsorption(false)
+        setGravity(FxGravity.RIGHT_OR_TOP)
         setEdgeOffset(40f)
         setBottomBorderMargin(40f)
         setAnimationImpl(FxAnimationImpl())

app/src/main/java/com/petterp/floatingx/app/utils.kt

@@ -44,6 +44,17 @@ inline fun ViewGroup.addLinearLayout(obj: LinearLayout.() -> Unit) =
         }
     )
 
+inline fun ViewGroup.addFrameLayout(obj: FrameLayout.() -> Unit) =
+    addView(
+        FrameLayout(context).apply {
+            layoutParams = FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT
+            )
+            obj.invoke(this)
+        }
+    )
+
 inline fun ViewGroup.addNestedScrollView(obj: NestedScrollView.() -> Unit) {
     addView(
         NestedScrollView(context).apply {

build.gradle

@@ -1,18 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext {
-        kotlin_version = "1.5.21"
-        minsdk_version = 21
-        targetsdk_version = 31
-        compilesdk_version = 31
-        version_name = '1.1.2'
-        versionCode = {
-            def cmd = 'git rev-list HEAD --count'
-            cmd.execute().text.trim().toInteger()
-        }
-        group_id = 'com.petterp'
-        artifactId = 'floatingx'
-    }
+    apply from: "config.gradle"
     repositories {
         google()
         mavenCentral()

config.gradle

@@ -0,0 +1,24 @@
+ext {
+    isDev = gradle.ext.IS_DEV
+    kotlin_version = "1.5.21"
+    minsdk_version = 21
+    targetsdk_version = 31
+    compilesdk_version = 31
+    version_name = isDev ? '9.9.9' : gitVersionTag()
+    versionCode = isDev ? "999" : gitVersionCode()
+    group_id = 'com.petterp'
+    artifactId = 'floatingx'
+}
+println "isDev:$isDev,versionName:$version_name,versionCode:$versionCode"
+
+static def gitVersionTag() {
+    def commit = 'git rev-list --tags --max-count=1'
+    def cmd = "git describe --tags ${commit.execute().text}"
+    def version = cmd.execute().text.trim()
+    return version
+}
+
+static def gitVersionCode() {
+    def cmd = 'git rev-list HEAD --count'
+    return cmd.execute().text.trim().toInteger()
+}

floatingx/src/main/java/com/petterp/floatingx/assist/FxGravity.kt

@@ -2,15 +2,16 @@ package com.petterp.floatingx.assist
 
 import android.view.Gravity
 
-/**
- * 对于位置而言,至少需要两个方向才能确定位置,如果单纯一个方向,那么另一个方向将无法确定,即x或y其中一个将无法计算
- * */
+/** 对于位置而言,至少需要两个方向才能确定位置,如果单纯一个方向,那么另一个方向将无法确定,即x或y其中一个将无法计算 */
 enum class FxGravity(val value: Int) {
     DEFAULT(Gravity.START or Gravity.TOP),
     LEFT_OR_TOP(Gravity.START or Gravity.TOP),
     LEFT_OR_CENTER(Gravity.START or Gravity.CENTER),
     LEFT_OR_BOTTOM(Gravity.START or Gravity.BOTTOM),
     RIGHT_OR_TOP(Gravity.END or Gravity.TOP),
     RIGHT_OR_CENTER(Gravity.END or Gravity.CENTER),
-    RIGHT_OR_BOTTOM(Gravity.END or Gravity.BOTTOM)
+    RIGHT_OR_BOTTOM(Gravity.END or Gravity.BOTTOM);
+
+    /** 是否为默认位置 */
+    fun isDefault() = this == DEFAULT
 }

floatingx/src/main/java/com/petterp/floatingx/assist/helper/BasisHelper.kt

@@ -420,8 +420,8 @@ open class BasisHelper {
 
         /** 辅助坐标的实现 采用坐标偏移位置,框架自行计算合适的x,y */
         private fun adtSizeViewDirection() {
-            // 如果坐标规则不符合要求,则按照默认规则
-            if (!enableAssistLocation && gravity == FxGravity.DEFAULT) return
+            // 如果坐标规则不符合要求,且未开启辅助定位,则直接返回
+            if (!enableAssistLocation && !gravity.isDefault()) return
             val edgeOffset = if (enableEdgeRebound) edgeOffset else 0f
             val b = assistLocation.b + edgeOffset + borderMargin.b
             val t = assistLocation.t + edgeOffset + borderMargin.t

floatingx/src/main/java/com/petterp/floatingx/assist/helper/ScopeHelper.kt

@@ -1,7 +1,7 @@
 package com.petterp.floatingx.assist.helper
 
 import android.app.Activity
-import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import com.petterp.floatingx.impl.control.FxScopeControl
 import com.petterp.floatingx.listener.control.IFxControl
@@ -19,7 +19,7 @@ class ScopeHelper : BasisHelper() {
         toControl().init(fragment)
 
     /** 插入到ViewGroup中 */
-    fun toControl(group: ViewGroup): IFxControl =
+    fun toControl(group: FrameLayout): IFxControl =
         toControl().init(group)
 
     private fun toControl(): IFxScopeControl<IFxControl> = FxScopeControl(this)

floatingx/src/main/java/com/petterp/floatingx/impl/control/FxScopeControl.kt

@@ -3,7 +3,7 @@ package com.petterp.floatingx.impl.control
 import android.app.Activity
 import android.app.Application
 import android.view.View
-import android.view.ViewGroup
+import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import com.petterp.floatingx.assist.helper.BasisHelper
 import com.petterp.floatingx.listener.control.IFxControl
@@ -24,24 +24,27 @@ class FxScopeControl(private val helper: BasisHelper) :
         getManagerView()?.show()
     }
 
-    override fun init(viewGroup: ViewGroup): IFxControl {
+    override fun init(group: FrameLayout): IFxControl {
         helper.initLog(FxScopeEnum.VIEW_GROUP_SCOPE.tag)
-        setContainerGroup(viewGroup)
+        setContainerGroup(group)
         return this
     }
 
     override fun init(fragment: Fragment): IFxControl {
         helper.initLog(FxScopeEnum.FRAGMENT_SCOPE.tag)
-        val parent = fragment.requireView() as ViewGroup
-        init(parent)
+        val rootView = fragment.view as? FrameLayout
+        checkNotNull(rootView) {
+            "Check if your root layout is FrameLayout, or if the init call timing is after onCreateView()!"
+        }
+        setContainerGroup(rootView)
         return this
     }
 
     override fun init(activity: Activity): IFxControl {
         helper.initLog(FxScopeEnum.ACTIVITY_SCOPE.tag)
         activity.contentView?.let {
-            init(it)
-        }
+            setContainerGroup(it)
+        } ?: helper.fxLog?.e("install to Activity the Error,current contentView(R.id.content) = null!")
         return this
     }