From 366c52738f91ea3b22f17243f9c3c0e31f743a50 Mon Sep 17 00:00:00 2001 From: renhaoting <370797079@qq.com> Date: Mon, 24 Nov 2025 14:07:25 +0800 Subject: [PATCH] =?UTF-8?q?0=E5=85=83=E8=B4=AD=20=E6=B7=BB=E5=8A=A0title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vididin/features/zero/ZeroBuyActivity.kt | 22 ++- app/src/main/res/layout/activity_zerobuy.xml | 186 +++++++++--------- .../res/mipmap-xxhdpi/icon_question_mark.webp | Bin 0 -> 1882 bytes app/src/main/res/values/strings.xml | 3 + .../architecture/widget/CustomTitleBar.kt | 4 +- 5 files changed, 124 insertions(+), 91 deletions(-) create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt index f9dd1d1..89e6871 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt @@ -4,8 +4,12 @@ import android.app.Activity import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.setOnClickBatch +import com.gamedog.vididin.R import com.gamedog.vididin.main.interfaces.OnTabStyleListener import com.gamedog.vididin.router.Router import dagger.hilt.android.AndroidEntryPoint @@ -35,10 +39,26 @@ class ZeroBuyActivity : AppViewsActivity(), OnT } - + titlebar.setTitleText(R.string.zero_buy) + titlebar.addRightIcon(R.mipmap.icon_question_mark, { + showHintInfo() + }) } } + override fun ViewBinding.initWindowInsets() { + ViewCompat.setOnApplyWindowInsetsListener(contentRoot) { v, insets -> + val systemBars = + insets.getInsets(WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()) + v.updatePadding(top = systemBars.top) + insets + } + } + + private fun showHintInfo() { + //TODO("Not yet implemented") + } + override fun ViewBinding.initListeners() { //TODO("Not yet implemented") } diff --git a/app/src/main/res/layout/activity_zerobuy.xml b/app/src/main/res/layout/activity_zerobuy.xml index 86b32f7..4575959 100644 --- a/app/src/main/res/layout/activity_zerobuy.xml +++ b/app/src/main/res/layout/activity_zerobuy.xml @@ -16,123 +16,133 @@ /> - - + - - - - - - + /> + android:layout_marginHorizontal="22dp"> + + + + + + + + - + android:orientation="vertical" + android:padding="15dp" + android:background="@drawable/zero_bg_4_items"> + + android:orientation="horizontal"> + + + + + + + + + + android:orientation="horizontal" + android:layout_marginTop="15dp"> + + + + + + + + + + - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp b/app/src/main/res/mipmap-xxhdpi/icon_question_mark.webp new file mode 100644 index 0000000000000000000000000000000000000000..d6ce3462f5bf8546aa6a3a1219a015884b6c1c07 GIT binary patch literal 1882 zcmaKpc~sNK7RM(n#fHdIC?s(i3(aaY^XSNCUc0*smr`!kx9#pUE~yQA{Wx& z7n!{y%n#x{5O1J<#-z_UK9Rks7eE>;otCs%Yta^OhafWu;m~&lw5$LJgn=O7yLf+S z4;k|;0PgPq&@K8DBb@=Dg$Drg(WjVAB>={U0g%W)#Xh}B;%@ftrQhj6UWY;f;B7Sk zE1^c1{RaSe^imFT|Kn`dP|6BA7ZVy(Km%l84RC+~;(;SXE>KgQfg9A};COuiHb?qc zn0TMBq+8xuz&#ycAfIPxO|Q_02FvI>A4uo}9kTX=DPJsA%vKv;wDrjj_>gmGZ=7CD zsxS_~yu9*F5|OisZ<>VItZC1fAH)Z@!qBtz-t7fMR_4bee?~q+>G~W3PPsN@dWIrH z9rLuj*-b7HOXznW1rDcec_IpFTW8XrWl&g^yV9lhgk)MI9(6ykRPb|GE-Vy8D?5iu z`5Advv5I#MlM%V=2hBd00N^uH7(|L7zf##@mhF${iF9R$|7Hj3ffQ{YV=WqksbyL< z$Q8Sc#V-nvolDG1m%j}92i#1vNo6JvG&Mc$c_u9*B>j{sU276bv2xUGD=OuYH(6sa zs~M`|G$h(}#$#UI+(f?pW0$Q^6ZwowM^3P?u^U;5UkyVwd!MGRc_nQYbn7-B)lkCW z19HJN$ysvzEMi|K9c9{o_UN~#_6n5EU;4i@8CI8kOiAMKtEs_Se7=K#=-s^~SQElE zYc1jNT}$B3O)-okES2KcWI$e?`n0*js?M#lqeh zaf3kv{`Rk%=HIGc4ZV-GoZqRZy{FHX#_q~nlZImLhC1bS9X9$#)Z*2k8rw8FUQATE zO$J-NsJS!|Q{GqM1ZJ~j9=@6HHGRtQ+tKZuxw}Een_0QKjh=lpn&DNcA>*8pXPd9l z6)88crn5VP%kxM;ml7gE#K?#Vqp1oN$4~YQ$dt;C9+<+pW2$h6D`J|5BJ&S?e)`7qR|pq}YgQ&9w)kuh2pfq-UEC^rcyWFF2~K{k zgZ+Ok5J6m>kRj#wqFN5eYZ*rLBy3(wEw3Sfb?J0y`@%0YotK`XN_KEj=QW#5&1KTP z5j(qHi8IbcWsPTf&9t;S6)P3YqoEd=IlC(PY^~!qW%b;H!S4!r+`7jz&#UNHWg-7Q zjHXl zG4PLl{!~Hz=;8A{WyhFGmls<6@4>B)-5M?OhrJK22zNqIX0;Wps)k>ZDc$JHHhjXc zV(az+Xa*+4Q*Z>zswVf-XJYOIR@K?qSstw4F3fgS+sucO$1lVsw^fret>*Aw)s2Ow z+2_m2nQQ+PSPE{Bwy!LGdxe-=%evp1a!hZnVhgjj@$srlQ*CkBTSr<-aQZi|9zgSK z{bPS!@r)Z*0$&J0Hs$x{aFKdn8;KFsci-m-PL(9oaLXrn#ug|$S$5|a;{-laQ*et^ z-ZANVNyiqqB1ctmZg92w{_qD=lNtZUtm9cXbmnLFY9I>5z8c(&;B;4BZzvakNoDLer4W_^1WMl!5ot`s+ZM;u<+P_E9%BJw9{ou@{|44G>-b|8gEX_KJhg5 i56_t=s(OF5^!Vh+&djOR(aEo;0;of;*+L^P0R95HBkK+T literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4163aad..05a4e7c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,6 +39,9 @@ Sorteio 333 - Grupo de 100 Meus Prêmios Histórico de Prêmios + Festa Grátis + + \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt b/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt index 7351a67..83503e7 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/widget/CustomTitleBar.kt @@ -91,7 +91,7 @@ class CustomTitleBar @JvmOverloads constructor( newImageView.setImageResource(iconRes) var layoutParam = LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT) - layoutParam.marginStart = 15.dp + layoutParam.marginEnd = 15.dp layoutParam.gravity = Gravity.CENTER_VERTICAL mBinding.llRightRoot.addView(newImageView, layoutParam) @@ -102,7 +102,7 @@ class CustomTitleBar @JvmOverloads constructor( newImageView.text = ResUtil.getString(textRes) var layoutParam = LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT) - layoutParam.marginStart = 15.dp + layoutParam.marginEnd = 15.dp layoutParam.gravity = Gravity.CENTER_VERTICAL mBinding.llRightRoot.addView(newImageView, layoutParam)