[new]修改 tool背景

KeyBoardView/build.gradle

@@ -37,7 +37,7 @@ repositories {
 }
 
 group 'com.qmai.android.widget'
-version '1.1.2-SNAPSHOT'
+version '1.1.4-SNAPSHOT'
 
 gradlePublish {
 

KeyBoardView/src/main/java/com/qmai/android/keyboard/NumberKeyBoard.kt

@@ -3,7 +3,6 @@ package com.qmai.android.keyboard;
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.EditText
-import android.widget.TextView
 import com.qmai.android.keyboardview.R
 
 /**
@@ -12,11 +11,10 @@ import com.qmai.android.keyboardview.R
  **/
 class NumberKeyBoard : QmKeyboardView {
 
-    private lateinit var editWidget: TextView
+    private lateinit var editWidget: EditText
 
     enum class Code constructor(var code: Int) {
-        ZERO(0), ONE(1), TWO(2), THREE(3), FOUR(4), FIVE(5),
-        SIX(6), SEVEN(7), EIGHT(8), NINE(9), DELETE(10), CLEAR(11)
+        DELETE(10), CLEAR(11)
     }
 
 

KeyBoardView/src/main/java/com/qmai/android/keyboard/QmKeyboard.java

@@ -694,9 +694,7 @@ public class QmKeyboard {
         return mShifted;
     }
 
-    /**
-     * @hide
-     */
+
     public int[] getShiftKeyIndices() {
         return mShiftKeyIndices;
     }
@@ -763,14 +761,12 @@ public class QmKeyboard {
     private void loadKeyboard(Context context, XmlResourceParser parser) {
         boolean inKey = false;
         boolean inRow = false;
-        boolean leftMostKey = false;
-        int row = 0;
         int x = 0;
         int y = 0;
         Key key = null;
         Row currentRow = null;
         Resources res = context.getResources();
-        boolean skipRow = false;
+        boolean skipRow;
 
         try {
             int event;
@@ -811,7 +807,7 @@ public class QmKeyboard {
                 } else if (event == XmlResourceParser.END_TAG) {
                     if (inKey) {
                         inKey = false;
-                        x += key.gap + key.width;
+                        x +=2* key.gap + key.width;
                         if (x > mTotalWidth) {
                             mTotalWidth = x;
                         }
@@ -819,7 +815,6 @@ public class QmKeyboard {
                         inRow = false;
                         y += currentRow.verticalGap;
                         y += currentRow.defaultHeight;
-                        row++;
                     } else {
                         // TODO: error or extend?
                     }
@@ -848,8 +843,6 @@ public class QmKeyboard {
 
         TypedArray a = res.obtainAttributes(attributeSet,
                R.styleable.CKeyBoard);
-        Log.v("keyBoard", "index Count  == "+a.getIndexCount());
-
 
         mDefaultWidth = getDimensionOrFraction(a,
                R.styleable.CKeyBoard_cKeyWidth,

KeyBoardView/src/main/java/com/qmai/android/keyboard/QmKeyboardView.java

@@ -680,8 +680,7 @@ public class QmKeyboardView extends View implements View.OnClickListener {
         }
         canvas.drawColor(0x00000000, PorterDuff.Mode.CLEAR);
         final int keyCount = keys.length;
-        for (int i = 0; i < keyCount; i++) {
-            final Key key = keys[i];
+        for (final Key key : keys) {
             if (drawSingleKey && invalidKey != key) {
                 continue;
             }

KeyBoardView/src/main/res/values/styles.xml

@@ -10,7 +10,7 @@
         <item name="keyPreviewHeight">80dp</item>
         <item name="labelTextSize">15sp</item>
         <item name="popupLayout">@layout/keyboard_popup_keyboard</item>
-        <item name="verticalCorrection">-10dip</item>
+        <item name="verticalCorrection">0dip</item>
         <item name="shadowColor">#333333</item>
         <item name="shadowRadius">0</item>
     </style>

KeyBoardView/src/main/res/xml/numkeyboard.xml

@@ -2,45 +2,52 @@
 <KeyBoard
         xmlns:app="http://schemas.android.com/apk/res-auto"
         app:cKeyHeight = "60dp"
-        app:CHorizontalGap= "48dp"
+        app:CHorizontalGap= "24dp"
         app:CVerticalGap = "13dp"
         app:cKeyWidth="60dp">
     <Row>
         <Key
                 app:codes="1"
+                app:keyEdgeFlags="left"
                 app:keyLabel="1" />
         <Key
                 app:codes="2"
                 app:keyLabel="2" />
         <Key
                 app:codes="3"
+                app:keyEdgeFlags="right"
                 app:keyLabel="3" />
     </Row>
     <Row>
         <Key
                 app:codes="4"
+                app:keyEdgeFlags="left"
                 app:keyLabel="4" />
         <Key
                 app:codes="5"
                 app:keyLabel="5" />
         <Key
                 app:codes="6"
+                app:keyEdgeFlags="right"
                 app:keyLabel="6" />
     </Row>
     <Row>
         <Key
                 app:codes="7"
+                app:keyEdgeFlags="left"
                 app:keyLabel="7" />
         <Key
                 app:codes="8"
                 app:keyLabel="8" />
         <Key
                 app:codes="9"
+                app:keyEdgeFlags="right"
                 app:keyLabel="9" />
     </Row>
     <Row>
         <Key
                 app:codes="11"
+                app:keyEdgeFlags="left"
                 app:keyLabel="清空" />
         <Key
                 app:codes="0"
@@ -48,6 +55,7 @@
         <Key
                 app:codes="10"
                 app:isRepeatable="true"
+                app:keyEdgeFlags="right"
                 app:keyIcon = "@drawable/keyboard_delete"
                 />
     </Row>

app/build.gradle

@@ -24,6 +24,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.hyman:flowlayout-lib:1.1.2'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.2'
@@ -38,7 +39,9 @@ dependencies {
     implementation project(path: ':tools')
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.github.sebdomdev:android-drawer-sheet:1.0'
-
+    implementation 'com.lxj:xpopup:2.0.6-rc1'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
  // todo test
 //    implementation 'com.android.tools.build:gradle:3.1.1'

app/src/main/java/com/qimai/android/widget/DemoDialogFragmemt.kt

@@ -3,35 +3,115 @@ package com.qimai.android.widget
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
+import com.lxj.xpopup.XPopup
+import com.lxj.xpopup.core.AttachPopupView
 import com.qimai.android.tools.dpTopx
 import com.qimai.android.tools.getScreenWidth
 import com.qimai.android.widgetlib.popup.AbsQMBaseDialogFragment
+import com.zhy.view.flowlayout.FlowLayout
+import com.zhy.view.flowlayout.TagAdapter
+import com.zhy.view.flowlayout.TagFlowLayout
 
 /**
  *   created by wangwei   ON 2019-11-06  email:wangwei_5521@163.com
  *   @version 1.1.1
  *   @Description
  **/
-class DemoDialogFragmemt  :
+class DemoDialogFragmemt :
     AbsQMBaseDialogFragment() {
 
+
     override fun prepareView(
         inflater: LayoutInflater?,
         container: ViewGroup?
     ): View {
-        val view = inflater?.inflate(R.layout.qm_alert_content, container, false)
+        val view = inflater?.inflate(R.layout.one_flow, container, false) as TagFlowLayout
+        val oneAdaptr = object : TagAdapter<String>(listOf("老乡鸡", "香肠", "发Joe", "发Joe房间诶哦")) {
+            override fun getView(parent: FlowLayout?, position: Int, t: String?): View {
 
-        return view!!
-    }
+                val textView = TextView(context)
+                textView.text = t!!
+                return textView
+
+            }
+
+            override fun onSelected(position: Int, view: View?) {
+                super.onSelected(position, view)
+
+                XPopup.Builder(context)
+                    .atView(view)
+                    .hasShadowBg(false)
+                    .isCenterHorizontal(true)
+                    .asCustom(object : AttachPopupView(context!!) {
+                        override fun getImplLayoutId(): Int {
+                            return R.layout.one_flow
+                        }
+
+                        override fun initPopupContent() {
+                            super.initPopupContent()
+
+                            val flow =
+                                attachPopupContainer.findViewById<TagFlowLayout>(R.id.flowLayout)
+
+                            val subAapter = object :
+                                TagAdapter<String>(listOf("老乡鸡", "香肠", "发Joe", "发Joe房间诶哦")) {
+                                override fun getView(
+                                    parent: FlowLayout?,
+                                    position: Int,
+                                    t: String?
+                                ): View {
+
+                                    val textView = TextView(context)
+                                    textView.text = t!!
+                                    return textView
+
+                                }
 
+                                override fun onSelected(position: Int, view: View?) {
+                                    super.onSelected(position, view)
 
+                                }
+
+
+                            }
+                            flow.adapter = subAapter
+
+                        }
+                    })
+                    .show();
+//
+//
+            }
+
+
+        }
+        view.adapter = oneAdaptr
+
+//        val sub = view!!.findViewById<TextView>(R.id.alert_confirm)
+//        sub.setOnClickListener{
+//            XPopup.Builder(context)
+//                .atView(sub)
+//                .isCenterHorizontal(true)
+//                .hasShadowBg(false)
+//                .asCustom(object : AttachPopupView(context!!){
+//                    override fun getImplLayoutId(): Int {
+//                        return R.layout.tip
+//                    }
+//                })
+//                .show();
+//
+//
+//        }
+
+        return view!!
+    }
 
 
     override fun config(): DialogFramgentConfig {
 
         return DialogFramgentConfig().apply {
-            context?.let {
-                c ->
+            context?.let { c ->
                 mWindowWidth = getScreenWidth(c) - c.dpTopx(30.0f)
 
             }

app/src/main/java/com/qimai/android/widget/MainActivity.kt

@@ -33,7 +33,7 @@ class MainActivity : AppCompatActivity() {
         }
         keyboard.bindEditText(inputText)
         findViewById<TextView>(R.id.drawer).setOnClickListener {
-            startActivity(Intent(MainActivity@ this, DrawerActivity::class.java))
+            startActivity(Intent(MainActivity@ this, CommomPopActivity::class.java))
         }
 
         findViewById<Button>(R.id.tip).setOnClickListener {

app/src/main/res/layout/activity_main.xml

@@ -70,6 +70,7 @@
 
         <com.qmai.android.keyboard.NumberKeyBoard
                 android:id="@+id/keyboard"
+                android:background="#444444"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
     </LinearLayout>

app/src/main/res/layout/one_flow.xml

+<?xml version="1.0" encoding="utf-8"?>
+<com.zhy.view.flowlayout.TagFlowLayout
+        android:id="@+id/flowLayout"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+</com.zhy.view.flowlayout.TagFlowLayout>
\ No newline at end of file

widgetlib/build.gradle

@@ -40,6 +40,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
 
+
 //    implementation 'com.qmai.android.tools:tools:1.1.1-SNAPSHOT'
 }
 repositories {

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QmTipOverlayDrawable.kt

 package com.qimai.android.widgetlib.popup
 
+import android.content.Context
 import android.graphics.*
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.view.Gravity
+import androidx.annotation.IntDef
 import androidx.core.content.ContextCompat
 import com.qimai.android.tools.dpTopx
 import com.qimai.android.widgetlib.R
@@ -14,7 +16,7 @@ import com.qimai.android.widgetlib.R
  *   @Description
  **/
 @Suppress("unused")
-internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
+class QmTipOverlayDrawable(builder: Builder) : Drawable() {
 
     private val outlineRect = Rect()
     private val radius: Float
@@ -32,14 +34,67 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
     private var showArrow = true
 
 
+    class Builder {
+
+        @IntDef(Gravity.TOP, Gravity.BOTTOM, Gravity.NO_GRAVITY)
+        @Retention(AnnotationRetention.SOURCE)
+        annotation class GravityRange
+
+        var defaultOverlayStyle: Int = R.style.QmToolTipOverlayDefault
+
+        @GravityRange
+        internal var gravity = Gravity.NO_GRAVITY
+
+
+        var showArrow = true
+
+        var arrowWeight = 0.5f
+
+        var offset = 0
+
+        var conetxt: Context? = null
+
+
+        fun withContext(ctx: Context) = apply {
+            this.conetxt = ctx
+        }
+
+        fun withArrowWeight(arrowWeight: Float) = apply {
+            this.arrowWeight = arrowWeight
+        }
+
+
+        fun withGravity(@GravityRange gravity: Int) = apply {
+            this.gravity = gravity
+        }
+
+        fun withArrowShow(showArrow: Boolean) = apply {
+            this.showArrow = showArrow
+        }
+
+
+        fun withDefaultOverlayStyle(defaultOverlayStyle: Int) = apply {
+
+            this.defaultOverlayStyle = defaultOverlayStyle
+        }
+
+        fun withOffset(offset: Int) = apply {
+            this.offset = offset
+        }
+
+
+
+    }
+
+
     /**
      * 0-1
      */
     private var arrowWeight = 0.5f
 
     init {
-        val context = builder.contentView!!.context
-        val theme = context.theme.obtainStyledAttributes(
+        val context = builder.conetxt
+        val theme = context!!.theme.obtainStyledAttributes(
             null,
             R.styleable.QmToolTipOverlay,
             0,
@@ -48,7 +103,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
         this.radius =
             theme.getDimensionPixelSize(
                 R.styleable.QmToolTipOverlay_overlay_radius,
-                context.dpTopx(5f)
+                context!!.dpTopx(5f)
             ).toFloat()
         this.bgColor = theme.getColor(
             R.styleable.QmToolTipOverlay_overlay_bgColor,
@@ -68,7 +123,7 @@ internal class QmTipOverlayDrawable(builder: QmToolTip.Builder) : Drawable() {
         this.showArrow = builder.showArrow
         this.rectF = RectF()
         bgPaint = Paint(Paint.ANTI_ALIAS_FLAG)
-        bgPaint.color =bgColor
+        bgPaint.color = bgColor
         bgPaint.style = Paint.Style.FILL
         if (borderColor != 0) {
             borderPaint = Paint(Paint.ANTI_ALIAS_FLAG)

widgetlib/src/main/java/com/qimai/android/widgetlib/popup/QmToolTip.kt

@@ -29,6 +29,7 @@ class QmToolTip private constructor(
 
     private val mWindow = PopupWindow()
     private val attachedViewLocation = IntArray(2)
+
     /**
      * 箭头离 anchor的距离
      */
@@ -47,7 +48,7 @@ class QmToolTip private constructor(
     private var containerMeasureHeight = 0
     private var arrowWeight = 0f
 
-    private  var offset = 0
+    private var offset = 0
 
     private constructor(builder: Builder) : this(
         builder.attachedView,
@@ -141,7 +142,16 @@ class QmToolTip private constructor(
 
             }
         }
-        container.background = QmTipOverlayDrawable(builder = builder)
+        container.background = QmTipOverlayDrawable(
+            QmTipOverlayDrawable.Builder()
+                .withContext(builder.contentView!!.context)
+                .withGravity(builder.gravity)
+                .withOffset(builder.offset)
+                .withArrowShow(builder.showArrow)
+                .withDefaultOverlayStyle(builder.defaultOverlayStyle)
+                .withArrowWeight(builder.arrowWeight)
+
+        )
 
         mWindow.contentView = container
         mWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
@@ -220,7 +230,7 @@ class QmToolTip private constructor(
                 point = calculateBottomOffset(anchorView)
             }
         }
-        return Point(point.x,point.y+offset)
+        return Point(point.x, point.y + offset)
     }
 
     private fun calculateTopOffset(anchorView: View): Point {