yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 调整聊天页面UI

Browse Source 
update 调整直播中英文
This commit is contained in:
zlzw 2024-03-22 15:27:35 +08:00
parent 82c4edf7e4
commit cd3a86c6b7
7 changed files with 324 additions and 309 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ local.properties
/live/build/ /live/build/
/main/build/ /main/build/
/video/build/ /video/build/
/tmp/full-r8-config.txt

2
common/src/main/res/layout/activity_user_home.xml
View File

@ -115,7 +115,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:src="@mipmap/icon_liveing_cn" android:src="@mipmap/icon_liveing"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

BIN
common/src/main/res/mipmap-mdpi/icon_liveing_cn.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 321 KiB

BIN
common/src/main/res/mipmap-mdpi/icon_liveing_en.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 320 KiB

87
main/src/main/res/layout/activity_edit_profile.xml
View File

@ -7,13 +7,15 @@
android:orientation="vertical"> android:orientation="vertical">
<ScrollView <ScrollView
android:layout_weight="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:orientation="vertical">
<include layout="@layout/view_title_not_color" /> <include layout="@layout/view_title_not_color" />
<RelativeLayout <RelativeLayout
@ -26,11 +28,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp" android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_avatar"
android:text="@string/edit_profile_avatar" android:text="@string/edit_profile_avatar"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" android:textSize="14sp"
/> app:drawableLeftCompat="@mipmap/ic_edit_avatar" />
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
@ -64,14 +65,14 @@
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_nickname" android:text="@string/edit_profile_nickname"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_name" />
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
@ -111,11 +112,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/edit_profile_sign"
android:drawablePadding="10dp" android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_sign" android:text="@string/edit_profile_sign"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_sign" />
<TextView <TextView
android:id="@+id/sign" android:id="@+id/sign"
@ -152,14 +153,14 @@
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_birthday"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_birthday" android:text="@string/edit_profile_birthday"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_birthday" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -201,19 +202,19 @@
<RelativeLayout <RelativeLayout
android:id="@+id/btn_sex" android:id="@+id/btn_sex"
android:visibility="gone"
style="@style/edit_profile_group_not_color" style="@style/edit_profile_group_not_color"
android:onClick="editProfileClick"> android:onClick="editProfileClick"
android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_sex"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_sex" android:text="@string/edit_profile_sex"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_sex" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -257,14 +258,14 @@
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_city"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_city" android:text="@string/edit_profile_city"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_city" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -310,14 +311,14 @@
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_phone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/bind_phone" android:text="@string/bind_phone"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_phone" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -363,24 +364,24 @@
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_occupation"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_occupation" android:text="@string/edit_profile_occupation"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_occupation" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="44dp" android:layout_marginStart="44dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="gone"
android:text="*" android:text="*"
android:textColor="#FF5730" android:textColor="#FF5730"
android:textSize="9sp" /> android:textSize="9sp"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/occupation" android:id="@+id/occupation"
@ -409,20 +410,21 @@
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout
android:id="@+id/btn_height" android:id="@+id/btn_height"
style="@style/edit_profile_group_not_color" style="@style/edit_profile_group_not_color"
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_height"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_height" android:text="@string/edit_profile_height"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_height" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -430,9 +432,9 @@
android:layout_marginStart="44dp" android:layout_marginStart="44dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="*" android:text="*"
android:visibility="gone"
android:textColor="#FF5730" android:textColor="#FF5730"
android:textSize="9sp" /> android:textSize="9sp"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/height" android:id="@+id/height"
@ -461,30 +463,31 @@
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout
android:id="@+id/btn_hobby" android:id="@+id/btn_hobby"
style="@style/edit_profile_group_not_color" style="@style/edit_profile_group_not_color"
android:onClick="editProfileClick"> android:onClick="editProfileClick">
<TextView <TextView
android:drawablePadding="10dp"
app:drawableLeftCompat="@mipmap/ic_edit_hobby"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:text="@string/edit_profile_hobby" android:text="@string/edit_profile_hobby"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textSize="14sp" /> android:textSize="14sp"
app:drawableLeftCompat="@mipmap/ic_edit_hobby" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="44dp" android:layout_marginStart="44dp"
android:visibility="gone"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="*" android:text="*"
android:textColor="#FF5730" android:textColor="#FF5730"
android:textSize="9sp" /> android:textSize="9sp"
android:visibility="gone" />
<TextView <TextView
android:id="@+id/hobby" android:id="@+id/hobby"
@ -519,6 +522,9 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout>
</ScrollView>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="213.5dp" android:layout_height="213.5dp"
@ -766,7 +772,4 @@
android:textSize="12.44sp" /> android:textSize="12.44sp" />
</RelativeLayout> </RelativeLayout>
</LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>

49
main/src/main/res/layout/view_msg_chat_title.xml
View File

@ -65,7 +65,7 @@
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -78,9 +78,9 @@
android:layout_width="94dp" android:layout_width="94dp"
android:layout_height="94dp" android:layout_height="94dp"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:layout_marginEnd="40dp" android:layout_marginEnd="25dp"
android:background="@mipmap/bg_msg_chat_title_avater" android:background="@mipmap/bg_msg_chat_title_avater"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.yunbao.common.views.weight.ClipPathCircleImage <com.yunbao.common.views.weight.ClipPathCircleImage
@ -99,7 +99,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginTop="-10dp" android:layout_marginTop="-10dp"
android:src="@mipmap/icon_liveing_cn" android:src="@mipmap/icon_liveing"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -110,12 +110,12 @@
android:id="@+id/userName" android:id="@+id/userName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="50dp" android:layout_marginStart="25dp"
android:layout_marginTop="60dp" android:layout_marginTop="60dp"
android:text="TextView" android:text="TextView"
android:textColor="#333333" android:textColor="#333333"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
@ -143,13 +143,7 @@
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:src="@mipmap/icon_green" /> android:src="@mipmap/icon_green" />
<ImageView
android:id="@+id/user_auth_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/ic_chat_auth"
tools:layout_editor_absoluteX="124dp"
tools:layout_editor_absoluteY="17dp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -163,14 +157,30 @@
app:layout_constraintStart_toStartOf="@+id/userName" app:layout_constraintStart_toStartOf="@+id/userName"
app:layout_constraintTop_toBottomOf="@+id/userName" /> app:layout_constraintTop_toBottomOf="@+id/userName" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/info"
app:layout_constraintStart_toEndOf="@+id/info"
app:layout_constraintTop_toTopOf="@+id/info">
<ImageView <ImageView
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
app:layout_constraintBottom_toBottomOf="@+id/info"
app:layout_constraintStart_toEndOf="@+id/info"
app:layout_constraintTop_toTopOf="@+id/info"
app:srcCompat="@mipmap/bg_msg_chat_title_gift" /> app:srcCompat="@mipmap/bg_msg_chat_title_gift" />
<ImageView
android:id="@+id/user_auth_status"
android:layout_width="84dp"
android:layout_height="20dp"
android:layout_marginStart="5dp"
android:scaleType="fitStart"
app:srcCompat="@mipmap/ic_chat_auth"
tools:layout_editor_absoluteX="124dp"
tools:layout_editor_absoluteY="17dp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/sign" android:id="@+id/sign"
@ -179,6 +189,7 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="个性签名给性签名个性签名给性签名个性签名给性签名" android:text="个性签名给性签名个性签名给性签名个性签名给性签名"
android:textColor="#333333" android:textColor="#333333"
android:maxLines="2"
android:textSize="13sp" android:textSize="13sp"
app:layout_constraintEnd_toStartOf="@+id/constraintLayout6" app:layout_constraintEnd_toStartOf="@+id/constraintLayout6"
app:layout_constraintStart_toStartOf="@+id/info" app:layout_constraintStart_toStartOf="@+id/info"
@ -211,14 +222,14 @@
android:id="@+id/avatar_list" android:id="@+id/avatar_list"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_marginStart="50dp" android:layout_marginStart="25dp"
android:layout_marginEnd="50dp" android:layout_marginEnd="30dp"
android:layout_marginBottom="60dp" android:layout_marginBottom="60dp"
android:orientation="horizontal" android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/imageView" app:layout_constraintEnd_toEndOf="@+id/imageView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/imageView"
tools:itemCount="9" tools:itemCount="9"
tools:listitem="@layout/view_msg_chat_top_image" /> tools:listitem="@layout/view_msg_chat_top_image" />

2
main/src/main/res/values/strings.xml
View File

@ -37,7 +37,7 @@
<string name="activity_msg_addressbook_tab_fan">Fan</string> <string name="activity_msg_addressbook_tab_fan">Fan</string>
<string name="activity_msg_addressbook_tab_fan2">Return</string> <string name="activity_msg_addressbook_tab_fan2">Return</string>
<string name="activity_msg_addressbook_tab_mutual">Mutual</string> <string name="activity_msg_addressbook_tab_mutual">Mutual</string>
<string name="activity_msg_chat_top_tip1">Accompany them with gifts~</string> <string name="activity_msg_chat_top_tip1">Let\'s chat!</string>
<string name="dialog_msg_m_config">Message Settings</string> <string name="dialog_msg_m_config">Message Settings</string>
<string name="dialog_msg_status_config">Order Settings</string> <string name="dialog_msg_status_config">Order Settings</string>
<string name="dialog_msg_status_online_config">Online</string> <string name="dialog_msg_status_online_config">Online</string>