feat(lite): 重构键盘样式移除自定义键盘样式，改为并优化对话框布局

-使用MaterialComponents的TextButton
- 更新对话框布局，调整按钮样式键盘按钮点击逻辑
- 更新主题和间距
- 在主界面添加KeyBoardView组件
- 优化样式，使用Base.Theme.AndroidLite.NoActionBar

Author: AndroidCoderPeng

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+        android:theme="@style/Theme.AndroidLite.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.MainActivity"

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

@@ -46,15 +46,17 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:text="按住录音"
-            android:textColor="@color/black" />
+            android:text="按住录音" />
 
         <Button
             android:id="@+id/socketButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/dp_10"
-            android:text="连接"
-            android:textColor="@color/black" />
+            android:text="连接" />
+
+        <com.pengxh.androidx.lite.widget.KeyBoardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/values/themes.xml

@@ -0,0 +1,10 @@
+<resources>
+    <!-- Base application theme. -->
+    <!--    android:theme="@style/Theme.MaterialComponents.Light.NoActionBar"-->  <!-- 圆方紫色按钮白字 -->
+    <!--    android:theme="@style/Theme.AppCompat.Light.NoActionBar"-->  <!-- 默认 -->
+    <style name="Base.Theme.AndroidLite.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <!-- Customize your light theme here. -->
+    </style>
+
+    <style name="Theme.AndroidLite.NoActionBar" parent="Base.Theme.AndroidLite.NoActionBar" />
+</resources>

lite/src/main/java/com/pengxh/androidx/lite/widget/KeyBoardView.java

@@ -1,14 +1,13 @@
 package com.pengxh.androidx.lite.widget;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
+import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
@@ -17,6 +16,7 @@
 
 public class KeyBoardView extends LinearLayout implements View.OnClickListener {
 
+    private static final String TAG = "KeyBoardView";
     private KeyboardClickListener listener = null;
 
     public KeyBoardView(Context context, @Nullable AttributeSet attrs) {
@@ -55,19 +55,15 @@ public boolean dispatchKeyEventInFullScreen(KeyEvent event) {
 
     @Override
     public void onClick(View v) {
-        if (v instanceof TextView) {
-            // 如果点击的是TextView
-            String value = ((TextView) v).getText().toString();
-            if (!TextUtils.isEmpty(value)) {
-                if (listener != null) {
-                    listener.onClick(value);
-                }
-            }
-        } else if (v instanceof ImageView) {
-            // 如果是图片那肯定点击的是删除
-            if (listener != null) {
-                listener.onDelete();
-            }
+        if (listener == null) {
+            Log.e(TAG, "onClick: ", new NullPointerException("listener is null"));
+            return;
+        }
+        String value = ((Button) v).getText().toString();
+        if (value.equals("DEL")) {
+            listener.onDelete();
+        } else {
+            listener.onClick(value);
         }
     }
 

lite/src/main/res/drawable/dialog_btn_gray.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="@color/lib_text_color"
+        android:fillColor="@color/black"
         android:pathData="M572.57,504.91l268.82,-268.76a42.73,42.73 0,1 0,-60.43 -60.43l-268.82,268.83 -268.77,-268.83a42.73,42.73 0,0 0,-60.43 60.43l268.83,268.76 -268.83,268.83a42.73,42.73 0,0 0,60.43 60.43l268.77,-268.82L780.97,834.16a42.73,42.73 0,0 0,60.43 -60.43z" />
 </vector>

lite/src/main/res/drawable/dialog_btn_white_smoke.xml

@@ -19,23 +19,22 @@
             android:fontFamily="sans-serif-medium"
             android:gravity="center"
             android:text="请设置标题"
-            android:textColor="@color/lib_text_color"
+            android:textColor="@color/black"
             android:textSize="@dimen/lib_sp_16" />
 
         <TextView
             android:id="@+id/dialogMessageView"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:paddingHorizontal="@dimen/lib_dp_20"
-            android:paddingBottom="@dimen/lib_dp_15"
             android:text="请设置弹窗信息"
             android:textColor="@color/lib_text_color" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/lib_px_1"
+            android:layout_marginTop="@dimen/lib_dp_20"
             android:background="@color/lib_line_color" />
 
         <LinearLayout
@@ -45,14 +44,15 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
                 android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textSize="@dimen/lib_sp_14" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -61,14 +61,15 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textSize="@dimen/lib_sp_14" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>