moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]加入房間ui調整

Browse Source
This commit is contained in:
wushaocheng
2023-02-23 09:28:25 +08:00
parent d9fbf78ba3
commit 85f2853eb5
3 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4158,7 +4158,7 @@
<string name="view_dialog_timepickerdialog_03">開始日期和結束日期相差不得超過6個月</string>
<string name="im_msgholder_hallmsgviewholder_01">已同意</string>
<string name="im_msgholder_hallmsgviewholder_02">已拒絕</string>
<string name="im_msgholder_hallmsgviewholder_03">已過期</string>
<string name="im_msgholder_hallmsgviewholder_03">已失效</string>
<string name="im_msgholder_hallmsgviewholder_04">已處理</string>
<string name="module_hall_im_nimhelper_01">群ID為空</string>
<string name="module_hall_im_nimhelper_02">獲取群信息失敗</string>

5
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
View File

@@ -11,6 +11,7 @@ import android.util.TypedValue;
import android.view.View;
import android.widget.TextView;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.alibaba.fastjson.JSON;
@@ -52,12 +53,12 @@ public class HallMsgViewHolder extends MsgViewHolderBase{
private ConstraintLayout clContainer;
private TextView tvTitle;
private SuperTextView stvAgree;
private AppCompatTextView stvAgree;
private TextView tvContent;
private View llOpLayout;
private SuperTextView stvReject;
private View llResultLayout;
private TextView tvResult;
private SuperTextView tvResult;
public HallMsgViewHolder(BaseMultiItemFetchLoadAdapter adapter) {
super(adapter);

131
app/src/module_labour_union/res/layout/layout_hall_msg_view_holder.xml
View File

@@ -6,41 +6,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_13"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/room_join_request" />
<TextView
android:id="@+id/tv_content"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_17"
android:textColor="@color/color_666666"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="@string/layout_layout_hall_msg_view_holder_02" />
<View
android:id="@+id/view_space"
app:layout_constraintTop_toBottomOf="@id/tv_content"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17" />
<LinearLayout
android:id="@+id/ll_op_layout"
android:layout_width="0dp"
@@ -48,35 +13,33 @@
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center_horizontal"
android:orientation="horizontal"
tools:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_space">
app:layout_constraintTop_toBottomOf="@id/view_space"
tools:visibility="gone">
<com.coorchice.library.SuperTextView
android:id="@+id/stv_reject"
android:layout_width="75dp"
android:layout_height="25dp"
android:layout_marginEnd="@dimen/dp_10"
android:gravity="center"
android:text="@string/lu_reject"
android:textColor="@color/appColor"
android:layout_marginEnd="@dimen/dp_10"
android:textSize="@dimen/sp_13"
app:corner="@dimen/dp_20"
app:stroke_color="@color/appColor"
app:stroke_width="1px" />
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_14"
app:corner="@dimen/dp_15"
app:solid="@color/color_E6E6F0" />
<com.coorchice.library.SuperTextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/stv_agree"
android:layout_width="75dp"
android:layout_height="25dp"
android:gravity="center"
android:text="@string/lu_agree"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_13"
app:corner="@dimen/dp_20"
app:solid="@color/appColor" />
android:textColor="@color/color_white"
android:textSize="@dimen/sp_14"
android:background="@drawable/bg_common_confirm_15" />
</LinearLayout>
@@ -86,27 +49,67 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
tools:visibility="visible"
android:layout_marginBottom="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_space">
app:layout_constraintTop_toBottomOf="@id/view_space"
tools:visibility="visible">
<com.coorchice.library.SuperTextView
android:id="@+id/tv_result"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_30"
android:gravity="center"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_14"
tools:text="@string/layout_layout_hall_msg_view_holder_03"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_24"
app:corner="@dimen/dp_15"
app:solid="@color/color_E6E6F0"/>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:background="@color/line_353548"
android:layout_width="match_parent"
android:layout_height="1px" />
<TextView
android:id="@+id/tv_result"
tools:text="@string/layout_layout_hall_msg_view_holder_03"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_333333"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="40dp" />
android:background="@color/line_353548" />
</LinearLayout>
<TextView
android:id="@+id/tv_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_17"
android:gravity="center"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:textColor="@color/color_666666"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="@string/layout_layout_hall_msg_view_holder_02" />
<View
android:id="@+id/view_space"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_17"
app:layout_constraintTop_toBottomOf="@id/tv_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_13"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/room_join_request" />
</androidx.constraintlayout.widget.ConstraintLayout>