From 9ca41b702a431e47be412a1e1f4d57c5df9c2939 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Mon, 29 May 2023 14:23:48 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=88=86=E5=8C=BA=E5=8A=9F=E8=83=BDui?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/ui/setting/AreaSelectActivity.kt | 10 ++++++-- .../ui/setting/adapter/PartitionAdapter.kt | 10 ++++++++ .../drawable-xhdpi/ic_partition_select.webp | Bin 0 -> 938 bytes .../{bg_ffffff.xml => bg_ffffff_10.xml} | 1 + .../res/drawable/selector_partition_bg.xml | 4 +-- .../main/res/layout/activity_area_select.xml | 19 ++++++++++++-- app/src/main/res/layout/item_partition.xml | 24 +++++++++++++----- app/src/main/res/layout/list_item_search.xml | 18 +++++++++---- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../res/drawable-xhdpi/ic_dy_in_room.png | Bin 2074 -> 0 bytes 16 files changed, 76 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_partition_select.webp rename app/src/main/res/drawable/{bg_ffffff.xml => bg_ffffff_10.xml} (79%) delete mode 100644 app/src/module_community/res/drawable-xhdpi/ic_dy_in_room.png diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt index 435512eda..2f44584b2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt @@ -2,6 +2,7 @@ package com.yizhuan.erban.ui.setting import android.content.Context import android.content.Intent +import android.view.View import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R @@ -34,8 +35,13 @@ class AreaSelectActivity : BaseViewBindingActivity() binding.recyclerView.adapter = mPartitionAdapter setViewModel.partitionLiveData.observe(this) { - mPartitionAdapter.setSelectId(it.userPartitionId) - mPartitionAdapter.setNewData(it.partitionInfos) + if ((it.partitionInfos?.size ?: 0) > 0) { + mPartitionAdapter.setSelectId(it.userPartitionId) + mPartitionAdapter.setNewData(it.partitionInfos) + binding.tvTip.visibility = View.VISIBLE + } else { + binding.tvTip.visibility = View.GONE + } } setViewModel.changePartitionLiveData.observe(this) { diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/adapter/PartitionAdapter.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/adapter/PartitionAdapter.kt index 80998e5af..cc5247f89 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/adapter/PartitionAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/adapter/PartitionAdapter.kt @@ -1,5 +1,7 @@ package com.yizhuan.erban.ui.setting.adapter +import android.view.View +import androidx.appcompat.widget.AppCompatImageView import androidx.constraintlayout.widget.ConstraintLayout import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder @@ -21,12 +23,20 @@ class PartitionAdapter : override fun convert(helper: BaseViewHolder, item: PartitionBean) { helper.setText(R.id.tvArea, item.desc) + val ivPartitionSelect = helper.getView(R.id.iv_partition_select) val isSelect = selectPosition == helper.layoutPosition if (selectId == item.id && selectPosition == -1) { + ivPartitionSelect.visibility = View.VISIBLE helper.getView(R.id.cs_bg).isSelected = true } else if (selectPosition != -1) { helper.getView(R.id.cs_bg).isSelected = isSelect + if (isSelect) { + ivPartitionSelect.visibility = View.VISIBLE + } else { + ivPartitionSelect.visibility = View.GONE + } } else { + ivPartitionSelect.visibility = View.GONE helper.getView(R.id.cs_bg).isSelected = false } } diff --git a/app/src/main/res/drawable-xhdpi/ic_partition_select.webp b/app/src/main/res/drawable-xhdpi/ic_partition_select.webp new file mode 100644 index 0000000000000000000000000000000000000000..81b947e6ddd356c6eb76f399024d3ca853586880 GIT binary patch literal 938 zcmWIYbaPw8%)k)t>J$(bU=hK^z`$St#Oh$=>FgYEf)U7NU_1dLS%6Zxc_l?b?oJ93 zkx>fl4;UDM5DXHNiwhtutRzs?w`&l!mvynKz%R&|l3JV$RPq6cRf>R?1KlJ7WQ(Lj z*cu>q5`=97VwaZ`lmOKPfY?PLLC!#S3XrXlj>JwvVkZ|AfzZ zZ((5Ab{-*y2$O=uqC~K9EI^VeEscTU({cs|-be-p;R_55T+v`TAc4be3P33tpu6&c zFr6WXA(cUa!IL46A(=rB$T9*(sv(0JFou0LGcqvfs~_ML2tTMWNkx74@0l42)<;#M zjOOqj&An}L?d!jNh4~+wZ*I#~>D=YJ{=e7$oVG$~&#uXF7HK~|#yaHWKh~?Xxb$)U z!LPe_{;xmre7eE9<2KA03)Q63+m|ohb;f#fRs@UG3YOd~D<;RQ9h!<4{k@NVW3d$5Nm zZIWD8djEQ6#wk#+G^mGfG4`CK;(0E2;pwM$-6p*|bL}bDs#cZ1GnamQdTE|Y=}f!Q zNxe(rlAoQ5=bWURy_L=6*5-)|S3OxZuXW1n4p(cVn7coJ%~sQt+rud}H4{ zJGrI3s;LtB$7Zl^Y~I9q%%)q{#MvNzdlLU)ku!7e9NEH_{5I+CQ>OLy^S@iY$$evV z_mAY~+VzJfrab(V?YD9Rci41s%YLiXH#4r=3lD6YZdroJx~7DYJL9m+qr_*EIvBD;-gm7 YpKf{orzx*~$mrhtfB3)PTYDx30N|e?NB{r; literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_ffffff.xml b/app/src/main/res/drawable/bg_ffffff_10.xml similarity index 79% rename from app/src/main/res/drawable/bg_ffffff.xml rename to app/src/main/res/drawable/bg_ffffff_10.xml index 83c737d41..e9505bf73 100644 --- a/app/src/main/res/drawable/bg_ffffff.xml +++ b/app/src/main/res/drawable/bg_ffffff_10.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_partition_bg.xml b/app/src/main/res/drawable/selector_partition_bg.xml index a11f1d7b1..5656f913b 100644 --- a/app/src/main/res/drawable/selector_partition_bg.xml +++ b/app/src/main/res/drawable/selector_partition_bg.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_area_select.xml b/app/src/main/res/layout/activity_area_select.xml index 87bd474ff..dbe24eced 100644 --- a/app/src/main/res/layout/activity_area_select.xml +++ b/app/src/main/res/layout/activity_area_select.xml @@ -9,17 +9,32 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_partition.xml b/app/src/main/res/layout/item_partition.xml index 0ddfac03f..f09a33cef 100644 --- a/app/src/main/res/layout/item_partition.xml +++ b/app/src/main/res/layout/item_partition.xml @@ -1,24 +1,36 @@ + android:layout_height="48dp"> + app:layout_constraintBottom_toBottomOf="parent" + tools:text="華語區"/> - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_search.xml b/app/src/main/res/layout/list_item_search.xml index 383939f9a..64b0e1557 100644 --- a/app/src/main/res/layout/list_item_search.xml +++ b/app/src/main/res/layout/list_item_search.xml @@ -1,6 +1,7 @@ - diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d828c5dc6..de4b76c82 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5251,5 +5251,6 @@ قليل تبديل منطقة تبديل منطقة بنجاح～ + يتم إعداد المزيد من المناطق ، لذا ترقبوا ~ diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 276cb09eb..3f3c240f7 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -5212,5 +5212,6 @@ Bit Change region Change region successfully~ + More partitions are being prepared, stay tuned~ diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 550506c05..a4367e39a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -5239,5 +5239,6 @@ orang Ubah server Ubah server berhasil~ + Lebih banyak partisi sedang disiapkan, pantau terus~ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4cc6c5668..783577690 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5245,5 +5245,6 @@ biraz Bölge değiştir Bölümü başarıyla değiştir~ + Daha fazla bölge hazırlanıyor, bu yüzden bizi izlemeye devam edin~ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f01f45158..41cbc8933 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5241,5 +5241,6 @@ 位 切換分區 切換分區成功～ + 更多分区正在准备中，敬请期待～ \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index f01f45158..41cbc8933 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -5241,5 +5241,6 @@ 位 切換分區 切換分區成功～ + 更多分区正在准备中，敬请期待～ \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a4e726b33..534c75c48 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5212,5 +5212,6 @@ Bit Change region Change region successfully~ + More partitions are being prepared, stay tuned~ diff --git a/app/src/module_community/res/drawable-xhdpi/ic_dy_in_room.png b/app/src/module_community/res/drawable-xhdpi/ic_dy_in_room.png deleted file mode 100644 index aeca96bbcfe459eaf85a441a97adfa1d6b74a829..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2074 zcmV+#2<7*QP)w;#h&D!dwV|b z{r~#^pZ_`M3WCb?s2kR_xL`+1Cj?M_L%D+jWszNF8dtmAM!AG?;*njj9rd|VC`MY{ z0S`Ctf~`2v`DQk-EBQg1T~Z#O?~?Ml^5)Lu@_3nCPZGHwuHQ`c#QaVwm!;O_`)Emd z&Sw6Zl*&8P^W^tZcwhNlJ2UHp?=$%w;4EG@wRXUR^8(G;2^+D)iROetZaQ7i#|A-| zYgczcl~76Qyw+YYJ6!OX(+yji-Eb6jIVJ1Y4Og7I;RQ{dW5+)12%Isw(BgqNF@H%# z_4At=-JoxA!#k+!aY@$*ka!!sU{DLK5gT82dc;odHt&XQLI>PmQE_n-bCam+PY~d& zsCy5bLl(>OhvtC^*3jXBYj|B(QE6!t>V3UqH{3v%$rz01gtzK*Fk$5jjy(YOJ@hO_ zJarW{mM5)119I$zON<4|8D~G}GLzm1L-xH0Z7*DG@j~@NeJQ6W(rS0lj5=MBj)K}_ zJ5f9lr;0J1PS5nlSi9+sD#vScxFcgu_sniJ?a*y5M;5=M5dlIxpgckDf!CV$QLyia z+t^^$LjE^0<)I>gNkOhiYRmoramC6oQS9!>5vFKKCgSxu!KvhyrGV!hQ~j*_;qj(@ zFw5AWVQolTr#0?}iKhJkC?6K=n_aUn;lte!1@8;)C!w@V!YeatU8m>nx_rPXz)_Hy zpJSFj(_SiYEFrkhBsQ0mf<%P&USk)9#xA%h_~8K!3jdpX(Hk22f%%d+oUGswf@p2% z%49GoaadwGiugxR32i>Wu_f4wF8UW^w4w`MPfUad==l`~5!?ZIOH(wIqBJe8Fq`n! zmaA@j9uw!Nl=jRe#^*_9nFwi$Neon^l~;BGWMm?n>((e4!8UZm2gnIfVs&gium&@s zp_|@Z?T3dK0=T4rAPcy7fT94aRVkp!Y?XJ{N#&voW|o(1aVcf^n-6SC0j>r&L>dm# z>4t+q8oHoKsPBdy^NCoC(l{w zdFsdD!DaZPjmbfca`{9)t`s>187nljt-|si8m#Z3P=5&CE;cx)JK~kC#S`gP32rR6 zFjuDxF54V8pWq6anToIdDE*r6M?7 z2Cx7nq1>3oia`q(oWvqZ87OmiZRG%mo6dH|3T0AQ)=vS2c7pEfF{??q<~;2B_<&QzE$9Bb4T8QA6Ad50w&}R#z!T zf(SujCuA%EPQ2!tOVc92QUxarTy2cklu-Kxy^R9aJoYBB<2mlZ=N6O2v897Ty*AFe z^6x*kBq-@}fF(;mI2kLHYr@h2a&hSZbCe7OfL|e8qg4UU` zj*C5u6r`l|pSmfKd5bQSMa!-_E4bRD@LbJN3N-`tJE6u$M`{KMSbWg7kiltpm5FGu znBa;z$5{qRyLAx34dR;H;v?IwK8oPT(FJaCMO(+I-5*tZoTPQHQl8^{G;H;WMz&cn z4Z}*yF$8yvOl3W+TjZ`XUvTmLOX+AQDWH(Iy~+Tt+6Pu-G>fcA?EuurGKZq)EJFxy zD7(8XC%Cw~$|jjynHq436NBVUW;F}^Vt}&@Lwofwf$Aapm7Hll4x7xw6tG}iIGy>s zzFfyPTFcY-6y-&)Dpx64#+Y<^(8h0A^U>vEag`0Hz)(F*ubYn(upWn35+w-B>?c>u zehQ}J@NpgorPq}XN*$irm&LM7`c$EXh{Ios1`cHx&av&g5m7mbdreWVd-}`rEVy_Zla8e_whD~zNvCMsg9l>Kb(Bkhfw|x$Ol@`ibA-7%ayd=P<8_pzuhe%Blc?bo{d!3#`f5HOQ580EjzSXxd>02htP4la z;Pv{FFu4_1az%2=KL~45cPjcl-uL2lvmqeuJ*r6m0q8lafVKxjWdHyG07*qoM6N<$ Ef=vGPH~;_u