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

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source
This commit is contained in:
18142669586
2023-10-07 15:57:41 +08:00
parent 2db7cf9980 e7ce538d78
commit 05f598fd22
31 changed files with 1298 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OneToOne/src/main/res/layout/activity_main.xml
View File

@@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:textSize="10sp"
android:gravity="center"
android:text="TextView1" />
android:text="交友" />
</LinearLayout>
<LinearLayout
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:textSize="10sp"
android:gravity="center"
android:text="TextView1" />
android:text="动态" />
</LinearLayout>
<LinearLayout
@@ -86,7 +86,7 @@
android:layout_height="wrap_content"
android:textSize="10sp"
android:gravity="center"
android:text="TextView1" />
android:text="消息" />
</LinearLayout>
<LinearLayout
@@ -106,7 +106,7 @@
android:layout_height="wrap_content"
android:textSize="10sp"
android:gravity="center"
android:text="TextView1" />
android:text="我的" />
</LinearLayout>
</com.angcyo.tablayout.DslTabLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

45
OneToOne/src/main/res/layout/rc_conversationlist_item.xml
View File

@@ -4,19 +4,40 @@
xmlns:tools="http://schemas.android.com/tools"
android:background="#F7F7F7"
android:layout_width="match_parent"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/rc_conversation_portrait"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true"
tools:src="@tools:sample/avatars" />
app:layout_constraintTop_toTopOf="parent">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/rc_conversation_portrait"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerHorizontal="true"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:riv_oval="true" />
<ImageView
android:id="@+id/sex"
android:layout_width="16dp"
android:layout_height="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@mipmap/ic_message_tab_woman" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/rc_conversation_title"
@@ -27,8 +48,8 @@
android:textColor="@android:color/black"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/rc_conversation_content"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait"
app:layout_constraintTop_toTopOf="@+id/rc_conversation_portrait"
app:layout_constraintStart_toEndOf="@+id/constraintLayout"
app:layout_constraintTop_toTopOf="@+id/constraintLayout"
tools:text="@tools:sample/full_names" />
<TextView
@@ -36,14 +57,15 @@
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toBottomOf="@+id/rc_conversation_portrait"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_portrait"
app:layout_constraintBottom_toBottomOf="@+id/constraintLayout"
app:layout_constraintStart_toEndOf="@+id/constraintLayout"
tools:text="@tools:sample/lorem[4:10]" />
<TextView
android:id="@+id/rc_conversation_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/rc_conversation_content"
tools:text="@tools:sample/date/hhmm" />
@@ -52,7 +74,6 @@
android:id="@+id/rc_conversation_unread"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

9
OneToOne/src/main/res/layout/rc_extension_input_panel.xml
View File

@@ -32,7 +32,8 @@
android:visibility="visible"
app:layout_constraintEnd_toStartOf="@+id/input_panel_emoji_btn"
app:layout_constraintStart_toEndOf="@+id/input_panel_voice_toggle"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<TextView
android:id="@+id/press_to_speech_btn"
@@ -50,7 +51,8 @@
android:visibility="gone"
app:layout_constraintEnd_toStartOf="@+id/input_panel_emoji_btn"
app:layout_constraintStart_toEndOf="@+id/input_panel_voice_toggle"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone" />
<ImageView
android:id="@+id/input_panel_emoji_btn"
@@ -102,12 +104,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/edit_btn">
app:layout_constraintTop_toBottomOf="@+id/input_panel_add_or_send">
<ImageView
android:id="@+id/input_panel_image_btn"

28
OneToOne/src/main/res/layout/view_msg_chat_list_top.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:id="@+id/notification"
layout="@layout/rc_conversationlist_item"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:id="@+id/interaction"
layout="@layout/rc_conversationlist_item"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:id="@+id/system"
layout="@layout/rc_conversationlist_item"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

BIN
OneToOne/src/main/res/mipmap-xxhdpi/ic_message_tab_man.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

4
OneToOne/src/main/res/values/colors.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="rc_white_color">#F7F7F7</color>
</resources>