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

Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
zlzw
2024-03-29 13:05:10 +08:00
parent 2a4ce7740b 7f40b899a9
commit 3f717131cc
20 changed files with 108 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/res/layout/activity_community_details.xml
View File

@@ -81,7 +81,7 @@
<LinearLayout
android:id="@+id/followLayout"
android:layout_width="78dp"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:background="@drawable/bg_main_com_type"
android:gravity="center"
@@ -91,6 +91,7 @@
android:id="@+id/followIcon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="10dp"
android:src="@mipmap/icon_like_follow" />
<TextView
@@ -98,6 +99,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="10dp"
android:text="@string/follow"
android:textColor="@color/white"
android:textSize="14dp"
@@ -188,7 +190,7 @@
android:id="@+id/replyCount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="评论0"
android:text="0"
android:textColor="#333333"
android:textSize="16dp"
android:textStyle="bold" />
@@ -255,7 +257,7 @@
android:layout_height="40dp"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="说点什么..."
android:hint="@string/video_say_something"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textSize="14dp" />

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

@@ -183,7 +183,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="立即发表"
android:text=""
android:textColor="#333333"
android:textSize="12dp"
android:visibility="invisible" />

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

@@ -801,7 +801,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@mipmap/icon_right_gray"
android:visibility="invisible" />
android:visibility="visible" />
</LinearLayout>

6
common/src/main/res/layout/item_comment_reply_view.xml
View File

@@ -46,7 +46,7 @@
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="作者"
android:text="@string/active_author"
android:textColor="@color/white"
android:textSize="12dp"
android:visibility="gone" />
@@ -61,7 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="删除"
android:text="@string/delete"
android:textColor="#777777"
android:textSize="11dp"
android:visibility="gone" />
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:padding="10dp"
android:text="举报"
android:text="@string/report"
android:textColor="#333333"
android:textSize="11dp"
android:textStyle="bold" />

14
common/src/main/res/layout/item_comment_video_view.xml
View File

@@ -59,7 +59,7 @@
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="作者"
android:text="@string/active_author"
android:textColor="@color/white"
android:textSize="10dp"
android:visibility="gone" />
@@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="删除"
android:text="@string/delete"
android:textColor="#777777"
android:textSize="11dp"
android:visibility="gone" />
@@ -97,7 +97,7 @@
android:layout_marginTop="10dp"
android:layout_marginRight="5dp"
android:padding="10dp"
android:text="举报"
android:text="@string/report"
android:textColor="#333333"
android:textSize="11dp"
android:textStyle="bold" />
@@ -148,7 +148,7 @@
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="作者"
android:text="@string/active_author"
android:textColor="@color/white"
android:textSize="11dp"
android:visibility="gone" />
@@ -163,7 +163,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="删除"
android:text="@string/delete"
android:textColor="#777777"
android:textSize="11dp"
android:visibility="gone" />
@@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:padding="10dp"
android:text="举报"
android:text="@string/report"
android:textColor="#333333"
android:textSize="11dp"
android:textStyle="bold" />
@@ -203,7 +203,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="5dp"
android:text="共4条回复>"
android:text="@string/active_count"
android:textColor="#FF4874"
android:textSize="12dp"
android:textStyle="bold"

10
common/src/main/res/layout/item_comment_view.xml
View File

@@ -56,7 +56,7 @@
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="作者"
android:text="@string/active_author"
android:textColor="@color/white"
android:textSize="10dp"
android:visibility="gone" />
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="删除"
android:text="@string/delete"
android:textColor="#777777"
android:textSize="11dp"
android:visibility="gone" />
@@ -145,7 +145,7 @@
android:gravity="center"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:text="作者"
android:text="@string/active_author"
android:textColor="@color/white"
android:textSize="11dp"
android:visibility="gone" />
@@ -160,7 +160,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="删除"
android:text="@string/delete"
android:textColor="#777777"
android:textSize="11dp"
android:visibility="gone" />
@@ -200,7 +200,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginTop="5dp"
android:text="共4条回复>"
android:text="@string/active_count"
android:textColor="#FF4874"
android:textSize="12dp"
android:textStyle="bold"