Merge branch 'master' of github.com:humanheima/ViewDemo

humanheima · Aug 15, 2021 · 2ca43c1 · 2ca43c1
2 parents 60aadbe + 1bb6dcf
commit 2ca43c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/com/hm/viewdemo/activity/CardViewActivity.kt b/app/src/main/java/com/hm/viewdemo/activity/CardViewActivity.kt
@@ -20,7 +20,6 @@ import kotlin.math.ceil
  */
 class CardViewActivity : AppCompatActivity() {
 
-
     private val TAG: String = "CardViewActivity"
 
     private val SHADOW_MULTIPLIER = 1.5f
@@ -32,6 +31,7 @@ class CardViewActivity : AppCompatActivity() {
 
     //圆角12dp
     private var mRadius: Int = 12
+
     //阴影和最大阴影都设为16dp
     private var mElevation: Int = 16
     private var mMaxElevation: Int = 16
@@ -43,6 +43,7 @@ class CardViewActivity : AppCompatActivity() {
 
     companion object {
 
+
         fun launch(context: Context) {
             val intent = Intent(context, CardViewActivity::class.java)
             context.startActivity(intent)

diff --git a/app/src/main/res/layout/activity_card_view.xml b/app/src/main/res/layout/activity_card_view.xml
@@ -32,6 +32,7 @@
 
 
     <View
+
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/colorAccent" />

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -26,21 +26,22 @@
                 android:textAllCaps="false" />
 
             <Button
-                android:id="@+id/btnCustomViewGetStart"
+                android:id="@+id/btn_test_outline"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:onClick="onClick"
-                android:text="《Android自定义控件开发入门与实战》"
+                android:text="测试 剪裁轮廓"
                 android:textAllCaps="false" />
 
             <Button
-                android:id="@+id/btn_test_outline"
+                android:id="@+id/btnCustomViewGetStart"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:onClick="onClick"
-                android:text="测试View的轮廓剪裁"
+                android:text="《Android自定义控件开发入门与实战》"
                 android:textAllCaps="false" />
 
+
             <Button
                 android:id="@+id/btn_myruler_view"
                 android:layout_width="match_parent"