From f37366d9311841fe30d6c82ee1db96319e400af0 Mon Sep 17 00:00:00 2001 From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com> Date: Thu, 4 Aug 2022 12:27:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E5=90=A7=E9=BE=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=20&=20UI=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/assets/litepal.xml | 2 +- .../tieba/post/activities/UserActivity.kt | 12 +++- .../tieba/post/models/database/Account.kt | 5 ++ app/src/main/res/layout/activity_user.xml | 65 +++++++++++++------ app/src/main/res/values/colors.xml | 2 +- gradle.properties | 1 + 7 files changed, 65 insertions(+), 24 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9bf38d0b..8d453219 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -279,7 +279,7 @@ android:label="@string/title_theme_settings" android:windowSoftInputMode="adjustResize" /> diff --git a/app/src/main/assets/litepal.xml b/app/src/main/assets/litepal.xml index d3d693c1..a678d870 100644 --- a/app/src/main/assets/litepal.xml +++ b/app/src/main/assets/litepal.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/UserActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/UserActivity.kt index 973e1ebb..d11332bd 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/UserActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/UserActivity.kt @@ -71,6 +71,9 @@ class UserActivity : BaseActivity() { @BindView(R.id.user_sex) lateinit var sexTv: TextView + @BindView(R.id.user_tb_age) + lateinit var tbAgeTv: TextView + @BindView(R.id.user_center_action_btn) lateinit var actionBtn: TintMaterialButton @@ -86,6 +89,9 @@ class UserActivity : BaseActivity() { @BindView(R.id.user_center_header_mask) lateinit var headerMaskView: View + @BindView(R.id.user_info_chips) + lateinit var infoChips: View + private var profileBean: ProfileBean? = null private var uid: String? = null private var tab = 0 @@ -117,8 +123,8 @@ class UserActivity : BaseActivity() { actionBtn.visibility = View.GONE if (!TextUtils.isEmpty(avatar)) { loadingView.visibility = View.GONE - ImageUtil.load(avatarView, ImageUtil.LOAD_TYPE_AVATAR, avatar) - ImageUtil.initImageView(avatarView, PhotoViewBean(avatar)) + ImageUtil.load(avatarView, ImageUtil.LOAD_TYPE_AVATAR, StringUtil.getAvatarUrl(avatar)) + ImageUtil.initImageView(avatarView, PhotoViewBean(StringUtil.getAvatarUrl(avatar))) } appbar.addOnOffsetChangedListener { appBarLayout: AppBarLayout, verticalOffset: Int -> val percent = abs(verticalOffset * 1.0f) / appBarLayout.totalScrollRange @@ -202,6 +208,8 @@ class UserActivity : BaseActivity() { } sexTv.text = if (profileBean!!.user!!.sex == "1") "♂" else if (profileBean!!.user!!.sex == "2") "♀" else "?" + tbAgeTv.text = getString(R.string.tb_age, profileBean!!.user!!.tbAge) + infoChips.visibility = View.VISIBLE } override fun onCreateOptionsMenu(menu: Menu): Boolean { diff --git a/app/src/main/java/com/huanchengfly/tieba/post/models/database/Account.kt b/app/src/main/java/com/huanchengfly/tieba/post/models/database/Account.kt index 8db83166..148b03e8 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/models/database/Account.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/models/database/Account.kt @@ -16,6 +16,11 @@ data class Account( var fansNum: String? = null, var postNum: String? = null, var concernNum: String? = null, + var tbAge: String? = null, + var age: String? = null, + var birthdayShowStatus: String? = null, + var birthdayTime: String? = null, + var constellation: String? = null, ) : LitePalSupport() { internal constructor() : this("", "", "", "", "", "", "") diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml index 1755c05c..a5dc1bdb 100644 --- a/app/src/main/res/layout/activity_user.xml +++ b/app/src/main/res/layout/activity_user.xml @@ -97,26 +97,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:textSize="16sp" + android:textSize="18sp" android:textStyle="bold" app:tint="@color/color_text_translucent_light" tools:text="USER" /> - + android:textSize="14sp" + app:tint="@color/color_text_secondary_translucent_light" + tools:text="介绍" /> @@ -175,6 +160,48 @@ android:textStyle="bold" app:tint="@color/color_text_translucent_light" /> + + + + + + + #FF3373EE #FF8E6DCA #50000000 - #50FFFFFF + #40FFFFFF #90000000 #FFFFFFFF \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 74002a74..568131a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,7 @@ android.useAndroidX=true kapt.verbose=true kotlin.code.style=official kotlin.parallel.tasks.in.project=true +kotlin.incremental.useClasspathSnapshot=true org.gradle.caching=true org.gradle.configureondemand=true org.gradle.jvmargs=-Xmx2g -XX:+UseParallelGC -Dfile.encoding=UTF-8