From 512b855c790445fd2700ad8b3a21d3f1b90291e3 Mon Sep 17 00:00:00 2001 From: zhujiang2 Date: Wed, 3 Aug 2022 21:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 7 ++- .../com/zj/play/main/login/LoginActivity.kt | 41 +++++++++++++- app/src/main/res/drawable/ic_eye.xml | 12 ++++ .../main/res/layout-land/activity_login.xml | 52 ++++++++++++++---- app/src/main/res/layout/activity_login.xml | 51 +++++++++++++---- .../main/res/layout/layout_search_item.xml | 10 ++-- config.gradle | 4 +- .../drawable-xxhdpi/img_delet_picture.webp | Bin 1212 -> 0 bytes core/src/main/res/drawable/ic_close.xml | 12 ++++ 9 files changed, 158 insertions(+), 31 deletions(-) create mode 100644 app/src/main/res/drawable/ic_eye.xml delete mode 100644 core/src/main/res/drawable-xxhdpi/img_delet_picture.webp create mode 100644 core/src/main/res/drawable/ic_close.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 9b1e53d8..cdadcdac 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -101,6 +101,8 @@ + + @@ -151,7 +153,7 @@ - + @@ -164,6 +166,7 @@ + @@ -172,7 +175,9 @@ + + diff --git a/app/src/main/java/com/zj/play/main/login/LoginActivity.kt b/app/src/main/java/com/zj/play/main/login/LoginActivity.kt index 7f8fc73d..70c19d52 100644 --- a/app/src/main/java/com/zj/play/main/login/LoginActivity.kt +++ b/app/src/main/java/com/zj/play/main/login/LoginActivity.kt @@ -4,7 +4,11 @@ import android.animation.Animator import android.animation.ObjectAnimator import android.content.Context import android.content.Intent +import android.text.Editable import android.text.TextUtils +import android.text.TextWatcher +import android.text.method.HideReturnsTransformationMethod +import android.text.method.PasswordTransformationMethod import android.view.View import android.view.animation.OvershootInterpolator import androidx.activity.viewModels @@ -19,7 +23,7 @@ import com.zj.play.main.MainActivity import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class LoginActivity : BaseActivity(), View.OnClickListener { +class LoginActivity : BaseActivity(), View.OnClickListener, TextWatcher { private lateinit var binding: ActivityLoginBinding private val viewModel by viewModels() @@ -35,6 +39,11 @@ class LoginActivity : BaseActivity(), View.OnClickListener { override fun initView() { binding.loginButton.setOnClickListener(this) binding.loginTvRegister.setOnClickListener(this) + binding.loginPassNumberClear.setOnClickListener(this) + binding.loginPassNumberVisible.setOnClickListener(this) + binding.loginPassNumberEdit.addTextChangedListener(this) + binding.loginPassNumberEdit.transformationMethod = + PasswordTransformationMethod.getInstance() viewModel.state.observe(this) { when (it) { Logging -> { @@ -60,6 +69,24 @@ class LoginActivity : BaseActivity(), View.OnClickListener { R.id.loginButton -> { loginOrRegister() } + R.id.loginPassNumberClear -> { + binding.loginPassNumberEdit.setText("") + } + R.id.loginPassNumberVisible -> { + val transformationMethod = binding.loginPassNumberEdit.transformationMethod + if (transformationMethod is PasswordTransformationMethod) { + binding.loginPassNumberEdit.transformationMethod = + HideReturnsTransformationMethod.getInstance() + binding.loginPassNumberVisible.setColorFilter(getColor(R.color.colorLoading)) + } else { + binding.loginPassNumberEdit.transformationMethod = + PasswordTransformationMethod.getInstance() + binding.loginPassNumberVisible.setColorFilter(getColor(R.color.text_color_black)) + } + binding.loginPassNumberEdit.setSelection( + binding.loginPassNumberEdit.text.toString().trim().length + ) + } } } @@ -116,6 +143,18 @@ class LoginActivity : BaseActivity(), View.OnClickListener { binding.loginInputElements.isVisible = !visible } + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + binding.loginPassNumberClear.isVisible = !s.isNullOrEmpty() + } + companion object { fun actionStart(context: Context) { val intent = Intent(context, LoginActivity::class.java) diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml new file mode 100644 index 00000000..83fe8dc6 --- /dev/null +++ b/app/src/main/res/drawable/ic_eye.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml index 97b771b4..55928f96 100644 --- a/app/src/main/res/layout-land/activity_login.xml +++ b/app/src/main/res/layout-land/activity_login.xml @@ -67,23 +67,53 @@ android:textSize="@dimen/sp_14" tools:ignore="TextFields" /> - + android:orientation="horizontal"> + + + + + + + + + - + android:orientation="horizontal"> + + + + + + + + + android:textSize="@dimen/sp_13" /> + android:layout_width="@dimen/dp_12" + android:layout_height="@dimen/dp_12" + android:background="@drawable/ic_close" + android:scaleType="center" /> diff --git a/config.gradle b/config.gradle index b68b7d29..464976aa 100644 --- a/config.gradle +++ b/config.gradle @@ -3,8 +3,8 @@ ext { compileSdkVersion : 32, minSdkVersion : 23, targetSdkVersion : 32, - versionCode : 28, - versionName : "4.5.0", + versionCode : 29, + versionName : "4.5.1", testInstrumentationRunner: "androidx.test.runner.AndroidJUnitRunner", consumerProguardFiles : 'consumer-rules.pro', ] diff --git a/core/src/main/res/drawable-xxhdpi/img_delet_picture.webp b/core/src/main/res/drawable-xxhdpi/img_delet_picture.webp deleted file mode 100644 index 8cce535945b5cd3bcc6024fa40c13955e8fa3dc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1212 zcmV;t1Vj5$Nk&Gr1ONb6MM6+kP&il$0000G0000b001Qb06|PpNdEx<00B?qux%Sj zS}NJS|N1ZZa5Y3k9>k5!$Ftej&iDSg-TfU!*rKEh`5{+;r(8j5Hs?&1MB1I9T#AjfAPm&Mi&uj@D_jG;Va}UBq?P{!55H>e$Hdf zV?sG@O^9;9bufiM^E?9&reRqVa_TXRFo*pUz}uSecOZmZgsOi4;vzu<53MMi0dU1h z9{f;?+--nVh$zC#kXB^g0Mvbm%qi3&6?X?MFGWQ;Sybl_B+_?_2Bf&Ms$+zU29vq!BS-V*7nF)dL~qHru%ovftwB-28-!% zuvlW$Cg4aBfB^pfhtuy||Iy(cj~@kWmCO%6-~Q9s-AMcyT$`~$X^ZmH2_3TXuiSJjU=qHW`JlI|FYU~bRu}tm@~><QX1o0?*`$Z7@Bb7_NJISNt%e zj|VRX&h96K&CHHe5xw_~M3vkU50AyMYXmU0lI?UyrGD7M|K_;<9WArWUVdI4UKr*zyJUa=~)^8 diff --git a/core/src/main/res/drawable/ic_close.xml b/core/src/main/res/drawable/ic_close.xml new file mode 100644 index 00000000..d2e915a1 --- /dev/null +++ b/core/src/main/res/drawable/ic_close.xml @@ -0,0 +1,12 @@ + + + +