maxinyu/SecurityDefenseDevice
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改按钮圆角值，和颜色差

Browse Source
This commit is contained in:
mxy6664
2026-07-28 10:35:44 +08:00
parent 55cf7196a6
commit 9f31f12463
7 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
View File

@@ -77,7 +77,7 @@ class LoginActivity : AppCompatActivity() {
binding.registerText.visibility = View.VISIBLE binding.registerText.visibility = View.VISIBLE
binding.forgetText.visibility = View.GONE binding.forgetText.visibility = View.GONE
updateRegisterTextConstraints(center = false) updateRegisterTextConstraints(center = true)
//需要正确的方法名和参数 //需要正确的方法名和参数
updateLoginButtonTopConstraint(R.id.smsRowLayout) updateLoginButtonTopConstraint(R.id.smsRowLayout)
@@ -102,7 +102,7 @@ class LoginActivity : AppCompatActivity() {
private fun updateLoginButtonTopConstraint(topTargetId: Int) { private fun updateLoginButtonTopConstraint(topTargetId: Int) {
val params = binding.loginBtn.layoutParams as ConstraintLayout.LayoutParams val params = binding.loginBtn.layoutParams as ConstraintLayout.LayoutParams
params.topToBottom = topTargetId params.topToBottom = topTargetId
params.topMargin = 32 params.topMargin = 40
binding.loginBtn.layoutParams = params binding.loginBtn.layoutParams = params
} }

2
app/src/main/res/drawable/rounded_blue_bg.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/green"/> <solid android:color="@color/green"/>
<corners android:radius="16dp"/> <corners android:radius="4dp"/>
</shape> </shape>

4
app/src/main/res/drawable/send_code_btn_selector.xml
View File

@@ -3,13 +3,13 @@
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/gray"/> <solid android:color="@color/gray"/>
<corners android:radius="16dp"/> <corners android:radius="99dp"/>
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/green"/> <solid android:color="@color/green"/>
<corners android:radius="16dp"/> <corners android:radius="99dp"/>
</shape> </shape>
</item> </item>
</selector> </selector>

2
app/src/main/res/drawable/textinput_white_bg.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@color/white"/> <solid android:color="@color/white"/>
<corners android:radius="10dp"/> <corners android:radius="99dp"/>
</shape> </shape>

34
app/src/main/res/layout/activity_login.xml
View File

@@ -77,7 +77,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/phoneRowLayout" android:id="@+id/phoneRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
app:layout_constraintTop_toBottomOf="@+id/tvSmsLogin" app:layout_constraintTop_toBottomOf="@+id/tvSmsLogin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -99,6 +99,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:hint="@string/phone_hint" android:hint="@string/phone_hint"
android:textSize="14dp"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@null" android:background="@null"
@@ -116,7 +117,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/smsRowLayout" android:id="@+id/smsRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -146,12 +147,13 @@
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@null" android:background="@null"
android:inputType="number" android:textSize="14dp"
android:paddingVertical="16dp" android:inputType="number"
app:layout_constraintStart_toEndOf="@+id/ivSmsIcon" android:paddingVertical="16dp"
app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn" app:layout_constraintStart_toEndOf="@+id/ivSmsIcon"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 发送验证码按钮 --> <!-- 发送验证码按钮 -->
<android.widget.Button <android.widget.Button
@@ -161,7 +163,7 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/send_sms_code" android:text="@string/send_sms_code"
android:textSize="14sp" android:textSize="14dp"
android:textColor="@color/send_code_text_color" android:textColor="@color/send_code_text_color"
android:background="@drawable/send_code_btn_selector" android:background="@drawable/send_code_btn_selector"
android:elevation="0dp" android:elevation="0dp"
@@ -178,7 +180,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/passwordRowLayout" android:id="@+id/passwordRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -202,11 +204,12 @@
<EditText <EditText
android:id="@+id/etPassword" android:id="@+id/etPassword"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:hint="@string/password_hint" android:hint="@string/password_hint"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14dp"
android:background="@null" android:background="@null"
android:inputType="textPassword" android:inputType="textPassword"
android:paddingVertical="16dp" android:paddingVertical="16dp"
@@ -214,7 +217,6 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -222,15 +224,15 @@
<android.widget.Button <android.widget.Button
android:id="@+id/loginBtn" android:id="@+id/loginBtn"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="40dp"
android:layout_marginTop="40dp"
android:text="@string/login" android:text="@string/login"
android:textSize="18sp" android:textSize="14dp"
android:elevation="0dp" android:elevation="0dp"
android:stateListAnimator="@null" android:stateListAnimator="@null"
android:background="@drawable/rounded_blue_bg" android:background="@drawable/rounded_blue_bg"
android:textColor="@color/white" android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@+id/smsRowLayout" app:layout_constraintTop_toBottomOf="@+id/smsRowLayout"
android:layout_marginTop="40dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
@@ -240,7 +242,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/register" android:text="@string/register"
android:textSize="14sp" android:textSize="14dp"
android:textColor="@color/green" android:textColor="@color/green"
android:padding="8dp" android:padding="8dp"
app:layout_constraintTop_toBottomOf="@+id/loginBtn" app:layout_constraintTop_toBottomOf="@+id/loginBtn"

20
app/src/main/res/layout/forget_password_activity.xml
View File

@@ -58,7 +58,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/phoneRowLayout" android:id="@+id/phoneRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -88,7 +88,7 @@
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textSize="16sp" android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon" app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon"
@@ -100,7 +100,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/smsRowLayout" android:id="@+id/smsRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -131,6 +131,7 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@null" android:background="@null"
android:inputType="number" android:inputType="number"
android:textSize="14dp"
android:paddingVertical="16dp" android:paddingVertical="16dp"
app:layout_constraintStart_toEndOf="@+id/ivSmsIcon" app:layout_constraintStart_toEndOf="@+id/ivSmsIcon"
app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn" app:layout_constraintEnd_toStartOf="@+id/sendCodeBtn"
@@ -145,7 +146,7 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/send_sms_code" android:text="@string/send_sms_code"
android:textSize="14sp" android:textSize="14dp"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/send_code_btn_selector" android:background="@drawable/send_code_btn_selector"
android:elevation="0dp" android:elevation="0dp"
@@ -162,7 +163,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/passwordRowLayout" android:id="@+id/passwordRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -192,6 +193,7 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:background="@null" android:background="@null"
android:inputType="text" android:inputType="text"
android:textSize="14dp"
android:paddingVertical="16dp" android:paddingVertical="16dp"
app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon" app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -205,7 +207,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/inviteRowLayout" android:id="@+id/inviteRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -235,7 +237,7 @@
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textSize="16sp" android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivInviteIcon" app:layout_constraintStart_toEndOf="@+id/ivInviteIcon"
@@ -247,11 +249,11 @@
<android.widget.Button <android.widget.Button
android:id="@+id/btnNext" android:id="@+id/btnNext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="56dp" android:layout_height="40dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="@string/determine" android:text="@string/determine"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="16sp" android:textSize="16dp"
app:cornerRadius="12dp" app:cornerRadius="12dp"
android:textColor="@color/white" android:textColor="@color/white"
android:elevation="0dp" android:elevation="0dp"

24
app/src/main/res/layout/register_activity.xml
View File

@@ -59,7 +59,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/phoneRowLayout" android:id="@+id/phoneRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -89,7 +89,7 @@
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textSize="16sp" android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon" app:layout_constraintStart_toEndOf="@+id/ivPhoneIcon"
@@ -100,7 +100,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/smsRowLayout" android:id="@+id/smsRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -129,6 +129,7 @@
android:hint="@string/sms_code_hint" android:hint="@string/sms_code_hint"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14dp"
android:background="@null" android:background="@null"
android:inputType="number" android:inputType="number"
android:paddingVertical="16dp" android:paddingVertical="16dp"
@@ -145,7 +146,7 @@
android:minWidth="0dp" android:minWidth="0dp"
android:minHeight="0dp" android:minHeight="0dp"
android:text="@string/send_sms_code" android:text="@string/send_sms_code"
android:textSize="14sp" android:textSize="14dp"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/send_code_btn_selector" android:background="@drawable/send_code_btn_selector"
android:elevation="0dp" android:elevation="0dp"
@@ -162,7 +163,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/idRowLayout" android:id="@+id/idRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -192,7 +193,7 @@
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textSize="16sp" android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivIdIcon" app:layout_constraintStart_toEndOf="@+id/ivIdIcon"
@@ -204,7 +205,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/passwordRowLayout" android:id="@+id/passwordRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -235,6 +236,7 @@
android:background="@null" android:background="@null"
android:inputType="text" android:inputType="text"
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textSize="14dp"
app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon" app:layout_constraintStart_toEndOf="@+id/ivPasswordIcon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -247,7 +249,7 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/inviteRowLayout" android:id="@+id/inviteRowLayout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:background="@drawable/textinput_white_bg" android:background="@drawable/textinput_white_bg"
android:paddingStart="16dp" android:paddingStart="16dp"
@@ -277,7 +279,7 @@
android:paddingVertical="16dp" android:paddingVertical="16dp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textColorHint="@color/gray" android:textColorHint="@color/gray"
android:textSize="16sp" android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivInviteIcon" app:layout_constraintStart_toEndOf="@+id/ivInviteIcon"
@@ -289,11 +291,11 @@
<android.widget.Button <android.widget.Button
android:id="@+id/btnNext" android:id="@+id/btnNext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="56dp" android:layout_height="40dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="@string/next_step" android:text="@string/next_step"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="16sp" android:textSize="16dp"
app:cornerRadius="12dp" app:cornerRadius="12dp"
android:textColor="@color/white" android:textColor="@color/white"
android:elevation="0dp" android:elevation="0dp"