fix:暂时取消个人主页显示用户ID(需求已改到下个版本) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2069

This commit is contained in:
liuyirong
2022-09-29 11:52:56 +08:00
parent ff0dcfd7e1
commit 9bdf69e9a6
2 changed files with 30 additions and 49 deletions

View File

@ -430,7 +430,6 @@ class UserHomeFragment : ToolbarFragment() {
userName.text = personalData.name
authTv.text = personalData.auth?.text
idTv.text = "ID:${personalData.id}"
ipRegionTv.goneIf(!(personalData.source != null && personalData.source.region.isNotEmpty()))
ipRegionTv.text = "IP属地${personalData.source?.region}"
userIntroduce.text = if (personalData.introduce.isNullOrBlank()) "这是一个很神秘的崽" else personalData.introduce
@ -668,11 +667,6 @@ class UserHomeFragment : ToolbarFragment() {
userName.text.toString().copyTextAndToast("用户昵称已复制~")
return@setOnLongClickListener true
}
idTv.setOnLongClickListener {
idTv.text.toString().substring(3).copyTextAndToast("用户ID复制成功")
return@setOnLongClickListener true
}
}
}

View File

@ -37,7 +37,7 @@
<RelativeLayout
android:id="@+id/user_background_container"
android:layout_width="match_parent"
android:layout_height="393dp"
android:layout_height="360dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
@ -247,7 +247,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ipAndRegionContainer"
android:id="@+id/authAndRegionContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
@ -256,59 +256,45 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/regulation_and_badge_container">
<TextView
android:id="@+id/idTv"
<LinearLayout
android:id="@+id/auth_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="@dimen/secondary_size"
tools:text="ID:11681168" />
android:layout_marginRight="16dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/authIcon"
android:layout_width="12dp"
android:layout_height="12dp"
app:placeholderImage="@drawable/ic_auth"
app:roundAsCircle="true" />
<TextView
android:id="@+id/authTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="@dimen/secondary_size"
tools:text="认证:游戏达人" />
</LinearLayout>
<TextView
android:id="@+id/ipRegionTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="@dimen/secondary_size"
android:visibility="gone"
tools:text="IP属地广东"
tools:visibility="visible" />
</LinearLayout>
<LinearLayout
android:id="@+id/auth_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginLeft="16dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ipAndRegionContainer">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/authIcon"
android:layout_width="12dp"
android:layout_height="12dp"
app:placeholderImage="@drawable/ic_auth"
app:roundAsCircle="true" />
<TextView
android:id="@+id/authTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="@dimen/secondary_size"
tools:text="认证:游戏达人" />
</LinearLayout>
<TextView
@ -325,7 +311,7 @@
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/auth_container"
app:layout_constraintTop_toBottomOf="@+id/authAndRegionContainer"
tools:text="这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长,这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长,这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长这是我的个性签名呀欢迎大家来撩,特别长的签名,很长很长" />
<androidx.constraintlayout.widget.ConstraintLayout
@ -591,6 +577,7 @@
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/changeBgTips"
android:layout_width="110dp"
android:layout_height="24dp"