yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房间相关UI对稿

Browse Source
This commit is contained in:
huangjian
2020-12-11 15:18:02 +08:00
parent c0a65984e3
commit c287c03157
47 changed files with 418 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -852,6 +852,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
.subscribe(homePlayList -> {
if (ListUtils.isListEmpty(homePlayList)) {
mBinding.tvAddFriends.setVisibility(View.GONE);
mBinding.rvAddFriends.setVisibility(View.GONE);
addFriendsAdapter.setNewData(null);
} else {
loopHomePlay(homePlayList, true);
@@ -866,7 +867,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
addFriendsDisposable.dispose();
}
mBinding.tvAddFriends.setVisibility(View.VISIBLE);
mBinding.rvAddFriends.setVisibility(View.VISIBLE);
if (refresh) {
for (int i = 0; i < homePlayList.size(); i++) {
HomePlayInfo playInfo = homePlayList.get(i);

10
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -5,6 +5,7 @@ import android.annotation.SuppressLint;
import androidx.lifecycle.Observer;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import androidx.annotation.NonNull;
@@ -341,10 +342,8 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
showLoadingView();
showLoadingAnimation();
sendGiftButton.setOnClickListener(this);
root.findViewById(R.id.gift_number_layout).setOnClickListener(this);
// initEasyPop();
giftNumLayout = root.findViewById(R.id.gift_number_layout);
giftNumLayout.setOnClickListener(this);
List<GiftTab> tabInfoList = new ArrayList<>();
tabInfoList.add(new GiftTab(GiftIndicator.TYPE_NORMAL, "礼物", "礼物"));
tabInfoList.add(new GiftTab(GiftIndicator.TYPE_NOBLE, "贵族", "贵族"));
@@ -695,7 +694,10 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
} else {
diamond = String.valueOf(totalValue);
}
tvGiftValue.setText("总价值:" + diamond + "钻石");
SpannableBuilder text = new SpannableBuilder()
.append("总价值: ", new ForegroundColorSpan(Color.parseColor("#7A797A")))
.append(diamond + "钻石", new ForegroundColorSpan(Color.WHITE));
tvGiftValue.setText(text.build());
}
private void showEmptyView() {

12
app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
View File

@@ -4,6 +4,9 @@ import android.content.Context;
import android.os.Bundle;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.View;
import android.view.WindowManager;
import android.widget.FrameLayout;
@@ -78,13 +81,18 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
tvQqZone.setOnClickListener(this);
tvCancel.setOnClickListener(this);
findViewById(R.id.tv_qq_game).setOnClickListener(this);
FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
if (bottomSheet != null) {
BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
BottomSheetBehavior.from(bottomSheet).setHideable(false);
}
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
Display d = windowManager.getDefaultDisplay();
DisplayMetrics realDisplayMetrics = new DisplayMetrics();
d.getRealMetrics(realDisplayMetrics);
WindowManager.LayoutParams params = getWindow().getAttributes();
params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = context.getResources().getDisplayMetrics().heightPixels - (Utils.hasSoftKeys(context) ? Utils.getNavigationBarHeight(context) : 0);
params.height = WindowManager.LayoutParams.MATCH_PARENT;
getWindow().setAttributes(params);
if (type == TYPE_SHARE_H5){

2
app/src/main/res/drawable/color_cursor.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<size android:width="0.5dp" />
<size android:width="1px" />
<solid android:color="#30F4F4F4" />
</shape>

2
app/src/main/res/layout/activity_bills_gift.xml
View File

@@ -53,7 +53,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_above="@+id/tv_gold_num"
android:visibility="gone"/>

2
app/src/main/res/layout/activity_notice_setting.xml
View File

@@ -15,7 +15,7 @@
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/line_color"
app:layout_constraintTop_toBottomOf="@id/title_bar" />

2
app/src/main/res/layout/activity_privacy_setting.xml
View File

@@ -15,7 +15,7 @@
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/line_color"
app:layout_constraintTop_toBottomOf="@id/title_bar" />

2
app/src/main/res/layout/box_ranking_list_item.xml
View File

@@ -143,7 +143,7 @@
android:id="@+id/view_line"
android:background="@color/color_F4F4F4"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginStart="90dp"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="gone"

641
app/src/main/res/layout/dialog_bottom_gift.xml
View File

@@ -1,354 +1,335 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll_dialog_bottom_gift"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_room_operation"
android:orientation="vertical">
<data>
</data>
<LinearLayout
android:id="@+id/ll_dialog_bottom_gift"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_dialog_room_operation"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="55dp">
<LinearLayout
android:id="@+id/desc_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="invisible"
tools:contentDescription="聊天窗口赠送礼物时才显示"
tools:visibility="visible">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_38"
android:layout_marginStart="@dimen/dp_15"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_7"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="用户名" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/avatar_list"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_38"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="#05FFFFFF" />
android:layout_height="55dp">
<LinearLayout
android:id="@+id/ll_tabs"
android:id="@+id/desc_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_36"
android:background="#0000"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="invisible"
tools:contentDescription="聊天窗口赠送礼物时才显示"
tools:visibility="visible">
<com.yizhuan.erban.ui.widget.magicindicator.GiftIndicator
android:id="@+id/gift_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<ImageView
android:id="@+id/iv_open_noble"
android:layout_width="88dp"
android:visibility="gone"
android:layout_height="31dp"
android:layout_gravity="center_vertical|end"
android:scaleType="fitCenter"
android:src="@drawable/icon_open_noble" />
<ImageView
android:id="@+id/iv_first_recharge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:scaleType="fitCenter"
android:src="@drawable/icon_oneyuan_gift"
android:visibility="gone"
/>
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_38"
android:layout_marginStart="@dimen/dp_15"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/tv_lucky_bag_intro"
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|end"
android:gravity="center_vertical"
android:text="玩法说明"
android:textColor="#7A7A7A"
android:textSize="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_15"
android:drawableStart="@drawable/ic_luckybag_intro"
android:drawablePadding="@dimen/dp_5"
android:visibility="gone"
/>
<TextView
android:id="@+id/tv_gift_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|end"
android:gravity="center_vertical"
android:text="总价值xxx钻石"
android:textColor="#7A7A7A"
android:textSize="@dimen/dp_13"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="gone"
/>
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_7"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="用户名" />
</LinearLayout>
<RelativeLayout
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/avatar_list"
android:layout_width="match_parent"
android:layout_height="210dp"
android:layout_marginTop="@dimen/dp_10">
android:layout_height="@dimen/dp_38"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15" />
</RelativeLayout>
<LinearLayout
android:id="@+id/layout_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="visible"
android:orientation="vertical"
tools:visibility="gone">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#05FFFFFF" />
<ImageView
android:id="@+id/iv_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_gift_loading" />
<LinearLayout
android:id="@+id/ll_tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_36"
android:background="#0000"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/text_loading"
android:textColor="@color/white_transparent_20"
android:textSize="@dimen/dp_14"
android:visibility="visible"
tools:ignore="SpUsage" />
</LinearLayout>
<com.yizhuan.erban.ui.widget.magicindicator.GiftIndicator
android:id="@+id/gift_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
<LinearLayout
android:id="@+id/layout_load_failed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical"
tools:visibility="visible">
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/tips_gift_load_failed"
android:textColor="@color/white_transparent_50"
android:textSize="@dimen/dp_14"
android:visibility="visible"
tools:ignore="SpUsage" />
<ImageView
android:id="@+id/iv_open_noble"
android:layout_width="88dp"
android:layout_height="31dp"
android:layout_gravity="center_vertical|end"
android:scaleType="fitCenter"
android:src="@drawable/icon_open_noble"
android:visibility="gone" />
<TextView
android:id="@+id/tv_reload"
android:layout_width="110dp"
android:layout_height="39dp"
android:layout_marginTop="@dimen/dp_15"
android:gravity="center"
android:text="@string/text_gift_reload"
android:background="@drawable/shape_round_white_radius_19dp_transparent_16"
android:textColor="@color/white_transparent_70"
android:textSize="@dimen/dp_15"
android:visibility="visible"
tools:ignore="SpUsage" />
</LinearLayout>
<ImageView
android:id="@+id/iv_first_recharge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:scaleType="fitCenter"
android:src="@drawable/icon_oneyuan_gift"
android:visibility="gone" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8" />
<TextView
android:id="@+id/tv_lucky_bag_intro"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/dp_15"
android:drawableStart="@drawable/ic_luckybag_intro"
android:drawablePadding="@dimen/dp_5"
android:gravity="center_vertical"
android:text="玩法说明"
android:textColor="#7A7A7A"
android:textSize="@dimen/dp_13"
android:visibility="gone" />
<LinearLayout
android:id="@+id/layout_empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_knap_gift_empty" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/text_gift_knapsack_empty"
android:textColor="@color/white_transparent_20"
android:textSize="@dimen/sp_12"
android:visibility="visible" />
</LinearLayout>
</RelativeLayout>
<com.yizhuan.erban.ui.gift.dialog.PageIndicatorView
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="6dp">
</com.yizhuan.erban.ui.gift.dialog.PageIndicatorView>
<EditText
android:id="@+id/et_gift_message"
android:layout_width="match_parent"
android:layout_height="34dp"
android:background="@color/color_F5F5F5_transparent_5"
android:hint="@string/hints_tips_gift_message"
android:maxLength="15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="0dp"
android:singleLine="true"
android:textColor="@color/white_transparent_50"
android:textColorHint="@color/white_transparent_30"
android:textSize="@dimen/dp_14"
android:visibility="gone"
tools:ignore="SpUsage"
tools:visibility="visible" />
<RelativeLayout
android:id="@+id/layout_recharge"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50">
<TextView
android:id="@+id/tv_recharge"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/tv_text_gold"
android:drawableEnd="@drawable/arrow_right_white"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:paddingStart="@dimen/dp_13"
android:paddingEnd="@dimen/dp_13"
android:text="@string/charge"
android:textColor="@color/appColor"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_text_gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="0钻石"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true">
<LinearLayout
android:id="@+id/send_container"
android:layout_width="136dp"
android:layout_height="@dimen/dp_30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:background="@drawable/shape_room_bg_send"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/gift_number_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:id="@+id/gift_number_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="8dp"
android:gravity="center_vertical"
android:text="1"
android:textColor="@color/white"
android:textSize="12sp" />
<ImageView
android:id="@+id/iv_gift_number_options"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_10"
android:src="@drawable/icon_room_send_arrow" />
</RelativeLayout>
<Button
android:id="@+id/btn_send"
android:layout_width="68dp"
android:layout_height="@dimen/dp_30"
android:background="@drawable/bg_magic_dialog_button_send"
android:text="赠送"
android:textColor="@color/white"
android:textSize="13dp" />
</LinearLayout>
<Button
android:id="@+id/btn_sendMagic"
android:layout_width="68dp"
android:layout_height="@dimen/dp_30"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_magic_dialog_button_send"
android:text="施法"
android:textColor="@color/white"
android:textSize="13dp"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>
<TextView
android:id="@+id/tv_gift_value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="center_vertical"
android:text="总价值xxx钻石"
android:textColor="#7A7A7A"
android:textSize="@dimen/dp_13"
android:visibility="gone" />
</LinearLayout>
</layout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="210dp"
android:layout_marginTop="@dimen/dp_10">
<LinearLayout
android:id="@+id/layout_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible"
tools:visibility="gone">
<ImageView
android:id="@+id/iv_loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/icon_gift_loading" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/text_loading"
android:textColor="@color/white_transparent_20"
android:textSize="@dimen/dp_14"
android:visibility="visible"
tools:ignore="SpUsage" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_load_failed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/tips_gift_load_failed"
android:textColor="@color/white_transparent_50"
android:textSize="@dimen/dp_14"
android:visibility="visible"
tools:ignore="SpUsage" />
<TextView
android:id="@+id/tv_reload"
android:layout_width="110dp"
android:layout_height="39dp"
android:layout_marginTop="@dimen/dp_15"
android:background="@drawable/shape_round_white_radius_19dp_transparent_16"
android:gravity="center"
android:text="@string/text_gift_reload"
android:textColor="@color/white_transparent_70"
android:textSize="@dimen/dp_15"
android:visibility="visible"
tools:ignore="SpUsage" />
</LinearLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8" />
<LinearLayout
android:id="@+id/layout_empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
tools:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_knap_gift_empty" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:gravity="center"
android:text="@string/text_gift_knapsack_empty"
android:textColor="@color/white_transparent_20"
android:textSize="@dimen/sp_12"
android:visibility="visible" />
</LinearLayout>
</RelativeLayout>
<com.yizhuan.erban.ui.gift.dialog.PageIndicatorView
android:id="@+id/indicator"
android:layout_width="match_parent"
android:layout_height="6dp">
</com.yizhuan.erban.ui.gift.dialog.PageIndicatorView>
<EditText
android:id="@+id/et_gift_message"
android:layout_width="match_parent"
android:layout_height="34dp"
android:background="@color/color_F5F5F5_transparent_5"
android:hint="@string/hints_tips_gift_message"
android:maxLength="15"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="0dp"
android:singleLine="true"
android:textColor="@color/white_transparent_50"
android:textColorHint="@color/white_transparent_30"
android:textSize="@dimen/dp_14"
android:visibility="gone"
tools:ignore="SpUsage"
tools:visibility="visible" />
<RelativeLayout
android:id="@+id/layout_recharge"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50">
<TextView
android:id="@+id/tv_recharge"
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/tv_text_gold"
android:drawableEnd="@drawable/ic_arrow_recharge"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:paddingStart="@dimen/dp_13"
android:paddingEnd="@dimen/dp_13"
android:text="@string/charge"
android:textColor="@color/color_FACB4D"
android:textSize="@dimen/sp_13" />
<TextView
android:id="@+id/tv_text_gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="0钻石"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<LinearLayout
android:id="@+id/send_container"
android:layout_width="130dp"
android:layout_height="@dimen/dp_30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:background="@drawable/shape_room_bg_send"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/gift_number_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/gift_number_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:lines="1"
android:textColor="@color/white"
android:textSize="12sp"
tools:text="1234" />
<ImageView
android:id="@+id/iv_gift_number_options"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_10"
android:layout_marginStart="10dp"
android:src="@drawable/icon_room_send_arrow" />
</LinearLayout>
<Button
android:id="@+id/btn_send"
android:layout_width="65dp"
android:layout_height="@dimen/dp_30"
android:background="@drawable/bg_magic_dialog_button_send"
android:text="赠送"
android:textColor="@color/white"
android:textSize="13dp" />
</LinearLayout>
<Button
android:id="@+id/btn_sendMagic"
android:layout_width="65dp"
android:layout_height="@dimen/dp_30"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_magic_dialog_button_send"
android:text="施法"
android:textColor="@color/white"
android:textSize="13dp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>

39
app/src/main/res/layout/dialog_gift_number.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="135dp"
android:layout_height="231dp"
android:layout_height="wrap_content"
android:background="@drawable/shape_bg_dialog_gift_number"
android:orientation="vertical">
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:text="一心一意"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -35,7 +35,7 @@
android:gravity="end"
android:text="1"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:text="十全十美"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:text="10"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:text="一切顺利"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:text="66"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:text="长长久久"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -128,7 +128,7 @@
android:layout_height="wrap_content"
android:text="99"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -146,7 +146,7 @@
android:layout_height="wrap_content"
android:text="要抱抱"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -159,7 +159,7 @@
android:layout_height="wrap_content"
android:text="188"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -177,7 +177,7 @@
android:layout_height="wrap_content"
android:text="我爱你"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -190,7 +190,7 @@
android:layout_height="wrap_content"
android:text="520"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -209,7 +209,7 @@
android:layout_height="wrap_content"
android:text="一生一世"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -222,7 +222,7 @@
android:layout_height="wrap_content"
android:text="1314"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -241,7 +241,7 @@
android:layout_height="wrap_content"
android:text="全部"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -254,7 +254,7 @@
android:layout_height="wrap_content"
android:text="all"
android:textColor="@color/appColor"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
</LinearLayout>
@@ -274,7 +274,7 @@
android:layout_height="wrap_content"
android:text="其他数额"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
android:textSize="@dimen/dp_11"
tools:ignore="HardcodedText,SpUsage" />
<TextView
@@ -285,8 +285,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_gift_recharge"
android:textColor="@color/appColor"
android:src="@drawable/arrow_right_white"
tools:ignore="ContentDescription" />
</LinearLayout>

2
app/src/main/res/layout/dialog_privacy_agreement.xml
View File

@@ -77,7 +77,7 @@
<View
android:layout_width="0.5dp"
android:layout_width="1px"
android:layout_height="50dp"
android:background="@color/color_ebebeb" />

2
app/src/main/res/layout/family_attention_item.xml
View File

@@ -107,7 +107,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true" />
</RelativeLayout>

2
app/src/main/res/layout/family_fans_list_item.xml
View File

@@ -107,7 +107,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/noble_avatar_view" />

2
app/src/main/res/layout/family_list_item_friend.xml
View File

@@ -104,7 +104,7 @@
<include
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/noble_avatar_view" />

2
app/src/main/res/layout/fans_list_item.xml
View File

@@ -152,7 +152,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/noble_avatar_view" />-->

4
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -208,7 +208,7 @@
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:paddingBottom="@dimen/dp_10"
android:visibility="visible" />
</LinearLayout>
@@ -219,7 +219,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:paddingTop="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator

2
app/src/main/res/layout/fragment_wallet_gold.xml
View File

@@ -125,7 +125,7 @@
<View
android:id="@+id/view_wallet_gold_line"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_below="@+id/tv_wallet_gold_normal"
android:layout_marginEnd="15dp"
android:layout_marginStart="15dp"

2
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -180,7 +180,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginBottom="0.5dp"
android:layout_marginBottom="1px"
android:ellipsize="end"
android:gravity="center"
android:maxLength="15"

2
app/src/main/res/layout/item_send.xml
View File

@@ -109,7 +109,7 @@
<!--<View-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="0.5dp"-->
<!--android:layout_height="1px"-->
<!--android:layout_alignParentBottom="true"-->
<!--android:layout_marginStart="15dp"-->
<!--android:layout_marginEnd="15dp"-->

2
app/src/main/res/layout/item_team_list.xml
View File

@@ -45,7 +45,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/iv_avatar" />

2
app/src/main/res/layout/layout_bill_item_view.xml
View File

@@ -37,7 +37,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignLeft="@+id/tv_item_text"
android:layout_alignParentBottom="true" />
</merge>

21
app/src/main/res/layout/layout_bottom_view.xml
View File

@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal">
android:gravity="center_vertical"
android:orientation="horizontal"
tools:background="@color/red">
<View
android:layout_width="@dimen/dp_10"
android:layout_width="@dimen/dp_15"
android:layout_height="0dp" />
<TextView
android:id="@+id/tv_room_send_msg_input"
android:layout_width="125dp"
android:layout_height="35dp"
android:layout_height="30dp"
android:background="@drawable/bg_room_msg_input"
android:gravity="center_vertical"
android:paddingStart="13dp"
@@ -31,6 +33,7 @@
android:id="@+id/icon_room_send_msg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/icon_room_send_msg" />
</LinearLayout>
@@ -46,7 +49,7 @@
android:id="@+id/icon_room_open_mic"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:scaleType="fitXY"
android:src="@drawable/icon_room_open_mic" />
</LinearLayout>
@@ -60,7 +63,7 @@
android:id="@+id/icon_room_open_remote_mic"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:scaleType="fitXY"
android:src="@drawable/icon_remote_mute_close" />
</LinearLayout>
@@ -75,6 +78,7 @@
android:id="@+id/icon_room_face"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@drawable/icon_face_btn" />
</LinearLayout>
@@ -89,6 +93,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_9"
android:scaleType="fitXY"
android:src="@drawable/icon_room_mic_queue" />
<ImageView
@@ -96,6 +101,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_9"
android:scaleType="fitXY"
android:src="@drawable/ic_room_message" />
<ImageView
@@ -103,6 +109,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_9"
android:scaleType="fitXY"
android:src="@drawable/icon_send_magic" />
<ImageView
@@ -110,6 +117,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginStart="@dimen/dp_9"
android:scaleType="fitXY"
android:src="@drawable/icon_room_game"
android:visibility="visible" />
@@ -124,6 +132,7 @@
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_marginEnd="@dimen/dp_15"
android:scaleType="fitXY"
android:src="@drawable/icon_room_send_gift" />
</LinearLayout>

2
app/src/main/res/layout/layout_chat_in_hall.xml
View File

@@ -110,7 +110,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginTop="15dp"
android:layout_marginEnd="12dp"
android:background="@color/color_F4F4F4" />

2
app/src/main/res/layout/layout_micro_view.xml
View File

@@ -100,7 +100,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginBottom="0.5dp"
android:layout_marginBottom="1px"
android:ellipsize="end"
android:gravity="center"
android:maxLength="15"

2
app/src/main/res/layout/list_charge_bills_item.xml
View File

@@ -31,7 +31,7 @@
<include
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignLeft="@id/tv_gold"
android:layout_alignParentBottom="true" />

4
app/src/main/res/layout/list_item_dialog_gift.xml
View File

@@ -43,7 +43,7 @@
android:layout_marginTop="3dp"
android:text="@{item.data().giftName}"
tools:text="123"
android:textColor="@{item.isSelect ? @color/appColor : @color/white}"
android:textColor="@{item.isSelect ? @color/color_ffb606 : @color/white}"
android:textSize="@dimen/dp_10"
tools:ignore="SpUsage" />
@@ -56,7 +56,7 @@
android:drawableStart="@{item.isSelect?item.radishDrawableSelected:item.radishDrawable}"
android:drawablePadding="2dp"
android:text="@{item.goldText}"
android:textColor="@{item.isSelect ? @color/color_7154EE_transparent_65 : @color/white_transparent_50}"
android:textColor="@{item.isSelect ? @color/color_ffb606_transparent_65 : @color/white_transparent_50}"
android:textSize="@dimen/dp_9"
tools:ignore="SpUsage"
tools:text="123" />

2
app/src/main/res/layout/list_item_friend.xml
View File

@@ -149,7 +149,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp" />-->

2
app/src/main/res/layout/newbie_list_item.xml
View File

@@ -128,7 +128,7 @@
android:id="@+id/view_line"
android:background="@color/color_F4F4F4"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginStart="90dp"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="gone"

2
app/src/main/res/layout/room_invite_list_item_layout.xml
View File

@@ -39,7 +39,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignLeft="@+id/tv_member_name"
android:layout_alignParentBottom="true" />

2
app/src/main/res/layout/view_password.xml
View File

@@ -34,7 +34,7 @@
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="#e5e5e5"/>
<com.jungly.gridpasswordview.GridPasswordView
android:id="@+id/view_password"

1
app/src/main/res/values/colors.xml
View File

@@ -539,5 +539,6 @@
<color name="notice_nick">#FEED8F</color>
<color name="notice_gift">#89FFFE</color>
<color name="color_FACB4D">#FACB4D</color>
</resources>

2
app/src/module_community/res/layout/activity_dynamic_detail.xml
View File

@@ -37,7 +37,7 @@
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/line_color"
app:layout_constraintBottom_toTopOf="@+id/ll_reply" />

2
app/src/module_community/res/layout/head_dynamic_detail.xml
View File

@@ -285,7 +285,7 @@
<View
android:id="@+id/view_line_detail_header"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20"

2
app/src/module_community/res/layout/item_community_notice_list.xml
View File

@@ -112,7 +112,7 @@
<View
android:layout_width="0dp"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/color_F4F4F4"
android:layout_marginStart="15dp"
android:layout_marginEnd="15.5dp"

4
app/src/module_community/res/layout/item_dy_comment.xml
View File

@@ -60,7 +60,7 @@
<View
android:id="@+id/line_reply_top"
android:layout_width="0dp"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color"
app:layout_constraintEnd_toEndOf="parent"
@@ -79,7 +79,7 @@
<View
android:id="@+id/line_reply_bottom"
android:layout_width="0dp"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/line_color"
app:layout_constraintEnd_toEndOf="@id/line_reply_top"
app:layout_constraintStart_toStartOf="@id/line_reply_top"

2
app/src/module_community/res/layout/item_dy_reply.xml
View File

@@ -67,6 +67,6 @@
app:layout_constraintTop_toBottomOf="@id/tv_content"
android:background="@color/line_color"
android:layout_width="0dp"
android:layout_height="0.5dp" />
android:layout_height="1px" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/module_community/res/layout/item_user_dynamic_list.xml
View File

@@ -242,7 +242,7 @@
<View
android:id="@+id/v_divider_bottom_user_dynamic"
android:layout_width="0dp"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/color_F4F4F4"
android:layout_marginEnd="20dp"
android:layout_marginTop="6dp"

2
app/src/module_community/res/layout/item_userinfo_dynamic.xml
View File

@@ -216,7 +216,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_marginStart="15dp"
android:layout_marginTop="9.5dp"
android:layout_marginEnd="15dp"

BIN
app/src/module_mini_world/res/drawable-xhdpi/ic_arrow_recharge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

20
app/src/module_mini_world/res/layout/fragment_av_room_game.xml
View File

@@ -111,25 +111,25 @@
android:id="@+id/fl_speedy_message"
android:layout_width="match_parent"
android:layout_height="22dp"
android:layout_marginBottom="5dp"
android:layout_marginStart="12dp"
android:layout_above="@+id/bottom_view">
android:layout_above="@+id/bottom_view"
android:layout_marginStart="15dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="6dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_speedy_message"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginEnd="50dp"
android:layout_marginEnd="30dp"
android:clipToPadding="false"
android:scrollbars="none"
android:paddingLeft="2dp" />
android:scrollbars="none" />
<ImageView
android:id="@+id/iv_close_speedy_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="@dimen/dp_18"
android:scaleType="fitXY"
android:src="@mipmap/ic_speedymsg_close" />
</FrameLayout>
@@ -144,8 +144,8 @@
android:id="@+id/message_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/micro_view"
android:layout_above="@+id/fl_speedy_message"
android:layout_below="@id/micro_view"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="90dp"

2
app/src/module_music/res/layout/list_item_add_music.xml
View File

@@ -56,7 +56,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/color_F5F5F5"
android:layout_alignParentBottom="true"
android:layout_marginStart="24dp" />

2
app/src/module_music/res/layout/list_item_local_music.xml
View File

@@ -53,7 +53,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:background="@color/color_F5F5F5"
android:layout_alignParentBottom="true"
android:layout_marginStart="24dp" />

2
app/src/module_music/res/layout/list_item_share_music.xml
View File

@@ -53,7 +53,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="24dp"
android:background="@color/color_F5F5F5" />

2
app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml
View File

@@ -127,7 +127,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp" />

2
app/src/module_public_chat_hall/res/layout/item_public_chat_hall_fans_list.xml
View File

@@ -128,7 +128,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp" />

2
app/src/module_public_chat_hall/res/layout/item_public_chat_hall_friend_list.xml
View File

@@ -127,7 +127,7 @@
android:id="@+id/view_line"
layout="@layout/layout_common_divider"
android:layout_width="fill_parent"
android:layout_height="0.5dp"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp" />

8
app/src/module_super_admin/res/layout/item_speedy_message.xml
View File

@@ -2,14 +2,14 @@
<com.coorchice.library.SuperTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_height="20dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:paddingStart="14dp"
android:paddingEnd="14dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:textColor="@color/white"
android:textSize="11sp"
app:corner="20dp"
app:solid="#26FFFFFF"
app:stroke_color="@color/white"
app:stroke_width="0.5dp"/>
app:stroke_width="1px"/>