From b55d9a4b380bc7d974b2ee0ffde923af5576273b Mon Sep 17 00:00:00 2001 From: maxinyu Date: Sat, 20 Jun 2026 16:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=83=8C=E6=99=AF=E9=98=B4=E5=BD=B1=EF=BC=8C=E7=94=9F?= =?UTF-8?q?=E6=88=90=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=92=8C=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal/InvitationCodeActivity.kt | 259 +++++++++++++----- app/src/main/res/layout/activity_login.xml | 4 + .../main/res/layout/add_device_activity.xml | 2 + .../main/res/layout/add_family_activity.xml | 2 + .../res/layout/add_linked_user_activity.xml | 2 + .../res/layout/change_password_activity.xml | 2 + .../main/res/layout/face_login_activity.xml | 2 + .../res/layout/face_verification_activity.xml | 2 + .../res/layout/forget_password_activity.xml | 6 +- .../res/layout/invitation_code_activity.xml | 11 +- .../main/res/layout/linked_user_activity.xml | 2 + app/src/main/res/layout/register_activity.xml | 4 + .../res/layout/register_success_activity.xml | 3 + .../res/layout/retrieve_password_activity.xml | 4 + app/src/main/res/layout/set_name_activity.xml | 2 + .../res/layout/strike_position_activity.xml | 2 + .../main/res/layout/user_details_activity.xml | 2 + .../layout/warning_voice_content_activity.xml | 6 +- .../res/layout/wifi_management_activity.xml | 2 + app/src/main/res/mipmap-xhdpi/syis.png | Bin 0 -> 540 bytes app/src/main/res/mipmap-xxhdpi/syis.png | Bin 0 -> 956 bytes app/src/main/res/mipmap-xxxhdpi/syis.png | Bin 0 -> 813 bytes 22 files changed, 251 insertions(+), 68 deletions(-) create mode 100644 app/src/main/res/mipmap-xhdpi/syis.png create mode 100644 app/src/main/res/mipmap-xxhdpi/syis.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/syis.png diff --git a/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt b/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt index 44fdf4c..f5bd46e 100644 --- a/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt +++ b/app/src/main/java/com/ckkj/defense_device/personal/InvitationCodeActivity.kt @@ -1,28 +1,39 @@ package com.ckkj.defense_device.personal +import android.Manifest +import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Color import android.graphics.Paint +import android.os.Build import android.os.Bundle import android.os.Environment +import android.util.Log import android.view.LayoutInflater import android.view.View +import android.widget.Toast +import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import com.google.android.material.bottomsheet.BottomSheetDialog import androidx.core.content.ContextCompat import com.ckkj.defense_device.R +import com.ckkj.defense_device.bean.RecommendationCodeBean import com.ckkj.defense_device.bean.VerifyOptionPasswordRequest import com.ckkj.defense_device.databinding.DialogExpireTimeBinding import com.ckkj.defense_device.databinding.InvitationCodeActivityBinding import com.ckkj.defense_device.utils.RetrofitNetwork +import com.ckkj.defense_device.view.LoadingDialog +import com.google.gson.Gson import com.google.zxing.BarcodeFormat import com.google.zxing.EncodeHintType import com.google.zxing.qrcode.QRCodeWriter import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel import com.gyf.immersionbar.ImmersionBar +import com.maning.mlkitscanner.scan.MNScanManager +import com.maning.mlkitscanner.scan.callback.act.MNScanCallback import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -44,7 +55,24 @@ class InvitationCodeActivity : AppCompatActivity() { private var isLoading = false // 是否正在加载 private var hasGeneratedQrCode = false // 是否已经生成过二维码 + private val requestPermissionsLauncher = registerForActivityResult( + ActivityResultContracts.RequestMultiplePermissions() + ) { permissions -> + val cameraGranted = permissions[Manifest.permission.CAMERA] ?: false + val storageGranted = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + permissions[Manifest.permission.READ_MEDIA_IMAGES] ?: false + } else { + permissions[Manifest.permission.READ_EXTERNAL_STORAGE] ?: false + } + if (cameraGranted && storageGranted) { + startScan() + } else { + Toast.makeText(this, R.string.permission_denied, Toast.LENGTH_SHORT).show() + } + } + companion object { + private const val TAG = "InvitationCodeActivity" const val EXPIRE_24H = 24 * 60 * 60 * 1000L const val EXPIRE_7D = 7 * 24 * 60 * 60 * 1000L } @@ -90,30 +118,130 @@ class InvitationCodeActivity : AppCompatActivity() { // 撤销邀请按钮 binding.btnCancelInvite.setOnClickListener { - showPasswordDialog { - cancelInvitation() + if (generatedInviteCode.isEmpty()) { + ToastUtils.showError(this, getString(R.string.qr_code_expired)) + return@setOnClickListener + } + showPasswordDialog { password, dialog -> + cancelInvitation(password, dialog) } } // 生成/重新生成按钮 binding.btnRegenerate.setOnClickListener { - showPasswordDialog { - generateOrRegenerateInvitation() + showPasswordDialog { password, dialog -> + generateOrRegenerateInvitation(password, dialog) } } + binding.sys.setOnClickListener { + checkPermissionsAndScan() + } + } + + private fun checkPermissionsAndScan() { + val cameraPermission = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) + val storagePermission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + ContextCompat.checkSelfPermission(this, Manifest.permission.READ_MEDIA_IMAGES) + } else { + ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) + } + if (cameraPermission == PackageManager.PERMISSION_GRANTED && + storagePermission == PackageManager.PERMISSION_GRANTED + ) { + startScan() + } else { + val permissionsToRequest = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + arrayOf( + Manifest.permission.CAMERA, + Manifest.permission.READ_MEDIA_IMAGES + ) + } else { + arrayOf( + Manifest.permission.CAMERA, + Manifest.permission.WRITE_EXTERNAL_STORAGE + ) + } + requestPermissionsLauncher.launch(permissionsToRequest) + } + } + + private fun startScan() { + MNScanManager.startScan(this, object : MNScanCallback { + override fun onActivityResult(resultCode: Int, data: Intent?) { + when (resultCode) { + MNScanManager.RESULT_SUCCESS -> { + val result = data?.getStringArrayListExtra(MNScanManager.INTENT_KEY_RESULT_SUCCESS) + if (!result.isNullOrEmpty()) { + ToastUtils.showToast(this@InvitationCodeActivity, "扫码成功: $result") + } else { + ToastUtils.showToast(this@InvitationCodeActivity, "扫码结果为空") + } + } + MNScanManager.RESULT_FAIL -> { + val error = data?.getStringExtra(MNScanManager.INTENT_KEY_RESULT_ERROR) + ToastUtils.showToast(this@InvitationCodeActivity, "扫码失败: $error") + } + MNScanManager.RESULT_CANCLE -> { + ToastUtils.showToast(this@InvitationCodeActivity, "扫码取消") + } + } + } + }) } /** * 生成或重新生成邀请码 */ - private fun generateOrRegenerateInvitation() { - // 根据当前选择的时效生成邀请码 - generateQRCode() - showQrCode() - // 更新按钮文字为"重新生成" - binding.btnRegenerate.text = getString(R.string.regenerate) - hasGeneratedQrCode = true - ToastUtils.showSuccess(this, getString(R.string.operation_success)) + private fun generateOrRegenerateInvitation(password: String, passwordDialog: PasswordInputDialog) { + if (isLoading) return + isLoading = true + val loadingDialog = LoadingDialog(this).apply { show() } + + CoroutineScope(Dispatchers.IO).launch { + try { + val response = RetrofitNetwork.getNetworkService() + .generateRecommendationCode(VerifyOptionPasswordRequest(password)) + Log.d(TAG, "生成推荐码响应: code=${response.code}, msg=${response.msg}, data=${response.data}") + withContext(Dispatchers.Main) { + isLoading = false + loadingDialog.dismiss() + if (response.code == 200) { + val parsed = parseRecommendationCode(response.data) + if (parsed != null) { + passwordDialog.dismiss() + generatedInviteCode = parsed.first + expireTimestamp = parsed.second + qrCodeContent = + "{\"type\":\"invite\",\"code\":\"$generatedInviteCode\",\"expire\":$expireTimestamp}" + Log.d( + TAG, + "推荐码生成成功: Code=$generatedInviteCode, expireTimestamp=$expireTimestamp, qrContent=$qrCodeContent" + ) + generateQRCode() + showQrCode() + binding.btnRegenerate.text = getString(R.string.regenerate) + hasGeneratedQrCode = true + ToastUtils.showSuccess(this@InvitationCodeActivity, getString(R.string.operation_success)) + } else { + Log.w(TAG, "推荐码解析失败, raw data=${response.data}") + passwordDialog.showError(getString(R.string.network_error)) + } + } else { + Log.w(TAG, "生成推荐码失败: code=${response.code}, msg=${response.msg}") + passwordDialog.showError( + response.msg.ifEmpty { getString(R.string.password_error) } + ) + } + } + } catch (e: Exception) { + Log.e(TAG, "生成推荐码异常", e) + withContext(Dispatchers.Main) { + isLoading = false + loadingDialog.dismiss() + passwordDialog.showError(getString(R.string.network_error)) + } + } + } } private fun showExpireTimeDialog() { @@ -151,9 +279,6 @@ class InvitationCodeActivity : AppCompatActivity() { binding.tvExpireTime.text = getString(R.string.expire_7d) } } - // 显示二维码并生成 - showQrCode() - generateQRCode() expireTimeDialog?.dismiss() } @@ -173,22 +298,28 @@ class InvitationCodeActivity : AppCompatActivity() { } private fun generateQRCode() { - // 检查二维码是否过期，如果过期则生成新的邀请码 - val isExpired = expireTimestamp > 0 && System.currentTimeMillis() > expireTimestamp - val content = if (qrCodeContent.isNotEmpty() && !isExpired) qrCodeContent else generateInviteCode() - val qrBitmap = createQRCodeWithLogo(content, 400, 400) + if (qrCodeContent.isEmpty()) return + val qrBitmap = createQRCodeWithLogo(qrCodeContent, 400, 400) binding.ivQrCode.setImageBitmap(qrBitmap) } - private fun generateInviteCode(): String { - val timestamp = System.currentTimeMillis() - expireTimestamp = timestamp + expireTimeInMillis - generatedInviteCode = "INV${timestamp}" - qrCodeContent = "{\"type\":\"invite\",\"code\":\"$generatedInviteCode\",\"expire\":$expireTimestamp}" - // 输出日志，方便调试验证 - android.util.Log.d("InvitationCode", "生成的二维码内容: $qrCodeContent") - android.util.Log.d("InvitationCode", "推荐码: $generatedInviteCode, 过期时间戳: $expireTimestamp") - return qrCodeContent + private fun parseRecommendationCode(data: Any?): Pair? { + if (data == null) return null + return when (data) { + is String -> { + if (data.isEmpty()) null + else Pair(data, System.currentTimeMillis() + expireTimeInMillis) + } + else -> { + val bean = Gson().fromJson(Gson().toJson(data), RecommendationCodeBean::class.java) + val code = bean.inviteCode?.takeIf { it.isNotEmpty() } + ?: bean.code?.takeIf { it.isNotEmpty() } + ?: return null + val expire = bean.expireTime ?: bean.expire + ?: (System.currentTimeMillis() + expireTimeInMillis) + Pair(code, expire) + } + } } /* * 这段代码生成带Logo的二维码： @@ -415,56 +546,62 @@ class InvitationCodeActivity : AppCompatActivity() { /** * 撤销邀请 */ - private fun cancelInvitation() { - // 撤销邀请逻辑 - hideQrCode() - generatedInviteCode = "" - qrCodeContent = "" - expireTimestamp = 0 - hasGeneratedQrCode = false - // 恢复按钮文字为"生成邀请码" - binding.btnRegenerate.text = getString(R.string.generate_invite_code) - // 显示提示 - ToastUtils.showSuccess(this, getString(R.string.operation_success)) - } - - /** - * 显示密码输入对话框 - * @param onSuccess 验证成功后的回调 - */ - private fun showPasswordDialog(onSuccess: () -> Unit) { - val dialog = PasswordInputDialog(this) - dialog.setTitle(getString(R.string.input_op_pwd)) - dialog.setOnConfirmListener { password -> - verifyPassword(password, dialog, onSuccess) + private fun cancelInvitation(password: String, passwordDialog: PasswordInputDialog) { + if (isLoading) return + if (generatedInviteCode.isEmpty()) { + passwordDialog.showError(getString(R.string.qr_code_expired)) + return } - dialog.show() - } + isLoading = true + val loadingDialog = LoadingDialog(this).apply { show() } - /** - * 验证操作密码 - */ - private fun verifyPassword(password: String, dialog: PasswordInputDialog, onSuccess: () -> Unit) { CoroutineScope(Dispatchers.IO).launch { try { val response = RetrofitNetwork.getNetworkService() - .verifyOptionPassword(VerifyOptionPasswordRequest(password)) + .revokeInvitation(VerifyOptionPasswordRequest(password)) + Log.d(TAG, "撤销邀请响应: code=${response.code}, msg=${response.msg}") withContext(Dispatchers.Main) { + isLoading = false + loadingDialog.dismiss() if (response.code == 200) { - dialog.dismiss() - onSuccess.invoke() + passwordDialog.dismiss() + hideQrCode() + generatedInviteCode = "" + qrCodeContent = "" + expireTimestamp = 0 + hasGeneratedQrCode = false + binding.btnRegenerate.text = getString(R.string.generate_invite_code) + ToastUtils.showSuccess(this@InvitationCodeActivity, getString(R.string.operation_success)) } else { - dialog.showError(getString(R.string.password_error)) + passwordDialog.showError( + response.msg.ifEmpty { getString(R.string.password_error) } + ) } } } catch (e: Exception) { + Log.e(TAG, "撤销邀请异常", e) withContext(Dispatchers.Main) { - dialog.showError(getString(R.string.network_error)) + isLoading = false + loadingDialog.dismiss() + passwordDialog.showError(getString(R.string.network_error)) } } } } + /** + * 显示密码输入对话框 + */ + private fun showPasswordDialog(onConfirm: (String, PasswordInputDialog) -> Unit) { + val dialog = PasswordInputDialog(this) + dialog.setTitle(getString(R.string.input_op_pwd)) + dialog.setOnConfirmListener { password -> + onConfirm(password, dialog) + } + dialog.show() + } + + override fun onDestroy() { super.onDestroy() expireTimeDialog?.dismiss() diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index e38c9e9..15c3fd1 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -164,6 +164,8 @@ android:background="@drawable/rounded_blue_bg" android:paddingHorizontal="12dp" android:maxWidth="120dp" + android:elevation="0dp" + android:stateListAnimator="@null" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -223,6 +225,8 @@ android:layout_marginTop="40dp" android:text="@string/login" android:textSize="18sp" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@+id/smsRowLayout" diff --git a/app/src/main/res/layout/add_device_activity.xml b/app/src/main/res/layout/add_device_activity.xml index 964f5b7..7766d0e 100644 --- a/app/src/main/res/layout/add_device_activity.xml +++ b/app/src/main/res/layout/add_device_activity.xml @@ -123,6 +123,8 @@ android:textColor="@color/white" android:textSize="16dp" android:textStyle="bold" + android:elevation="0dp" + android:stateListAnimator="@null" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/add_family_activity.xml b/app/src/main/res/layout/add_family_activity.xml index 465c695..6071da9 100644 --- a/app/src/main/res/layout/add_family_activity.xml +++ b/app/src/main/res/layout/add_family_activity.xml @@ -80,6 +80,8 @@ android:background="@drawable/rounded_blue_bg" android:text="@string/select_wifi" android:textColor="@color/white" + android:elevation="0dp" + android:stateListAnimator="@null" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/add_linked_user_activity.xml b/app/src/main/res/layout/add_linked_user_activity.xml index 9a20178..a6efd96 100644 --- a/app/src/main/res/layout/add_linked_user_activity.xml +++ b/app/src/main/res/layout/add_linked_user_activity.xml @@ -135,6 +135,8 @@ android:text="@string/confirm" android:textColor="@color/white" android:textSize="14dp" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" /> diff --git a/app/src/main/res/layout/change_password_activity.xml b/app/src/main/res/layout/change_password_activity.xml index fc4236d..560af38 100644 --- a/app/src/main/res/layout/change_password_activity.xml +++ b/app/src/main/res/layout/change_password_activity.xml @@ -105,6 +105,8 @@ android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" + android:elevation="0dp" + android:stateListAnimator="@null" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/etConfirmPassword" /> diff --git a/app/src/main/res/layout/face_login_activity.xml b/app/src/main/res/layout/face_login_activity.xml index 330d792..5d631a1 100644 --- a/app/src/main/res/layout/face_login_activity.xml +++ b/app/src/main/res/layout/face_login_activity.xml @@ -287,6 +287,8 @@ android:textColor="@color/white" android:textSize="14dp" android:textStyle="bold" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/face_verification_activity.xml b/app/src/main/res/layout/face_verification_activity.xml index d64ebc7..81ee83f 100644 --- a/app/src/main/res/layout/face_verification_activity.xml +++ b/app/src/main/res/layout/face_verification_activity.xml @@ -107,6 +107,8 @@ android:textSize="17sp" android:textStyle="bold" android:background="@drawable/bg_capture_face_button" + android:elevation="0dp" + android:stateListAnimator="@null" android:textColor="#F2FFFFFF" /> diff --git a/app/src/main/res/layout/forget_password_activity.xml b/app/src/main/res/layout/forget_password_activity.xml index c93b0c7..4b16ad8 100644 --- a/app/src/main/res/layout/forget_password_activity.xml +++ b/app/src/main/res/layout/forget_password_activity.xml @@ -153,6 +153,8 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" + android:elevation="0dp" + android:stateListAnimator="@null" android:layout_marginStart="12dp" /> @@ -246,11 +248,13 @@ android:layout_width="0dp" android:layout_height="56dp" android:layout_marginTop="32dp" - android:text="@string/determine" + android:text="@string/determine" android:textAllCaps="false" android:textSize="16sp" app:cornerRadius="12dp" android:textColor="@color/white" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/invitation_code_activity.xml b/app/src/main/res/layout/invitation_code_activity.xml index c1188d7..4d8df46 100644 --- a/app/src/main/res/layout/invitation_code_activity.xml +++ b/app/src/main/res/layout/invitation_code_activity.xml @@ -118,6 +118,7 @@ + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@mipmap/syis" /> @@ -211,6 +212,8 @@ android:layout_marginEnd="12dp" android:text="@string/cancel_invite" android:textColor="@color/green" + android:elevation="0dp" + android:stateListAnimator="@null" android:textSize="16sp" android:background="@drawable/bg_blue_border_round" android:textAllCaps="false" /> diff --git a/app/src/main/res/layout/linked_user_activity.xml b/app/src/main/res/layout/linked_user_activity.xml index 30e3328..a7d6fce 100644 --- a/app/src/main/res/layout/linked_user_activity.xml +++ b/app/src/main/res/layout/linked_user_activity.xml @@ -149,6 +149,8 @@ android:text="@string/add_linked_user" android:textColor="@color/white" android:textSize="14dp" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" /> android:textColor="@color/black" android:textSize="16sp" android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/backIcon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -80,6 +81,8 @@ tools:context=".login.RegisterSuccessActivity"> android:textColor="@color/white" android:textSize="14dp" android:textStyle="bold" + android:elevation="0dp" + android:stateListAnimator="@null" android:background="@drawable/rounded_blue_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/retrieve_password_activity.xml b/app/src/main/res/layout/retrieve_password_activity.xml index 5cb1396..9a17b66 100644 --- a/app/src/main/res/layout/retrieve_password_activity.xml +++ b/app/src/main/res/layout/retrieve_password_activity.xml @@ -91,6 +91,8 @@ android:paddingHorizontal="16dp" android:text="@string/get_verification_code" android:textColor="@color/white" + android:elevation="0dp" + android:stateListAnimator="@null" android:textSize="14sp" /> @@ -131,6 +133,8 @@ android:background="@drawable/rounded_blue_bg" android:text="@string/confirm_reset_password_btn" android:textColor="@color/white" + android:elevation="0dp" + android:stateListAnimator="@null" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/set_name_activity.xml b/app/src/main/res/layout/set_name_activity.xml index 1070176..67caf11 100644 --- a/app/src/main/res/layout/set_name_activity.xml +++ b/app/src/main/res/layout/set_name_activity.xml @@ -81,6 +81,8 @@ android:text="@string/complete" android:textColor="@color/white" android:textSize="16dp" + android:elevation="0dp" + android:stateListAnimator="@null" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/strike_position_activity.xml b/app/src/main/res/layout/strike_position_activity.xml index 9f9b45b..da4488f 100644 --- a/app/src/main/res/layout/strike_position_activity.xml +++ b/app/src/main/res/layout/strike_position_activity.xml @@ -76,6 +76,8 @@ android:background="@drawable/rounded_blue_bg" android:text="@string/submit" android:textColor="@color/white" + android:elevation="0dp" + android:stateListAnimator="@null" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/user_details_activity.xml b/app/src/main/res/layout/user_details_activity.xml index e3b22bb..03909c5 100644 --- a/app/src/main/res/layout/user_details_activity.xml +++ b/app/src/main/res/layout/user_details_activity.xml @@ -182,6 +182,8 @@ android:textSize="16dp" android:background="@drawable/rounded_blue_bg" android:padding="0dp" + android:elevation="0dp" + android:stateListAnimator="@null" android:layout_margin="0dp"/> diff --git a/app/src/main/res/layout/warning_voice_content_activity.xml b/app/src/main/res/layout/warning_voice_content_activity.xml index 8cb2e98..a8ddaa6 100644 --- a/app/src/main/res/layout/warning_voice_content_activity.xml +++ b/app/src/main/res/layout/warning_voice_content_activity.xml @@ -72,7 +72,7 @@ android:layout_height="0dp" android:layout_weight="1"/> -