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

feat:完成装扮商城、我的装扮 部分UI调整

Browse Source
This commit is contained in:
Max
2024-01-26 15:16:09 +08:00
parent dd87492ffb
commit 3bcac093c7
13 changed files with 150 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nnbc123/app/decoration/adapter/MyCarAdapter.java
View File

@@ -80,7 +80,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
tvUsed.setText("使用");
tvUsed.setBackgroundResource(R.drawable.bg_common_disable);
tvUsed.setEnabled(false);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_878b9c));
tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_2B2D33));
} else if (isUsing) {
tvUsed.setVisibility(View.VISIBLE);
tvUsed.setText("取消使用");
@@ -91,7 +91,7 @@ public class MyCarAdapter extends BaseAdapter<CarInfo> {
tvUsed.setVisibility(View.VISIBLE);
tvUsed.setText("使用");
tvUsed.setBackgroundResource(R.drawable.bg_common_confirm);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_282828));
tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_2B2D33));
tvUsed.setEnabled(true);
}

5
app/src/main/java/com/nnbc123/app/decoration/adapter/MyNamePlateAdapter.java
View File

@@ -36,8 +36,8 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
//使用按钮
TextView tvUsed = helper.getView(R.id.tv_used);
tvUsed.setBackgroundResource(item.isUsing() ? R.drawable.bg_common_cancel : R.drawable.bg_common_confirm);
tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_4C5AF1) :
mContext.getResources().getColor(R.color.white));
tvUsed.setTextColor(item.isUsing() ? mContext.getResources().getColor(R.color.color_2B2D33) :
mContext.getResources().getColor(R.color.color_2B2D33));
tvUsed.setText(item.isUsing() ? R.string.label_used : R.string.label_can_use);
if (item.isIsExpired()) { // 过期
// 日期展示
@@ -46,7 +46,6 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
tvUsed.setEnabled(false);
tvUsed.setBackgroundResource(R.drawable.bg_common_disable);
tvUsed.setText("使用");
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_878b9c));
} else {
String days;
if (item.getExpireDays() > 99) {

20
app/src/main/java/com/nnbc123/app/decoration/view/widgets/MyDecorationMagicIndicator.java
View File

@@ -1,13 +1,18 @@
package com.nnbc123.app.decoration.view.widgets;
import android.content.Context;
import android.graphics.Color;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.core.content.ContextCompat;
import com.nnbc123.app.R;
import com.nnbc123.app.ui.widget.magicindicator.buildins.UIUtil;
import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.nnbc123.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import com.nnbc123.core.home.bean.TabInfo;
import java.util.List;
@@ -38,9 +43,9 @@ public class MyDecorationMagicIndicator extends CommonNavigatorAdapter {
public IPagerTitleView getTitleView(Context context, final int i) {
BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.text_secondary_878b9c));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.text_title_282828));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(mContext, R.color.color_2B2D33));
scaleTransitionPagerTitleView.setMinScale(0.9f);
scaleTransitionPagerTitleView.setTextSize(15);
scaleTransitionPagerTitleView.setTextSize(14);
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());
if (mTitleList.get(i).getName().equals("座驾")) {
scaleTransitionPagerTitleView.findViewById(R.id.car_badge).setId(R.id.car_badge_garage);
@@ -62,7 +67,16 @@ public class MyDecorationMagicIndicator extends CommonNavigatorAdapter {
@Override
public IPagerIndicator getIndicator(Context context) {
return null;
LinePagerIndicator indicator = new LinePagerIndicator(context);
indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
indicator.setLineHeight(UIUtil.dip2px(context, 4));
indicator.setRoundRadius(UIUtil.dip2px(context, 2));
indicator.setLineWidth(UIUtil.dip2px(context, 8));
indicator.setColors(Color.parseColor("#FFDA24"));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
//lp.bottomMargin = 0;
indicator.setLayoutParams(lp);
return indicator;
}
public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) {

2
app/src/main/java/com/nnbc123/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/LinePagerIndicator.java
View File

@@ -112,7 +112,7 @@ public class LinePagerIndicator extends View implements IPagerIndicator {
@Override
public void onPageSelected(int position) {
onPageScrolled(position,0,0);
// onPageScrolled(position,0,0);
}
@Override

4
app/src/main/res/drawable/bg_common_confirm_press.xml
View File

@@ -4,8 +4,8 @@
<gradient
android:angle="180"
android:endColor="@color/color_218eff"
android:startColor="@color/color_7727e4"
android:endColor="#FFDA24"
android:startColor="#FFDA24"
android:type="linear"
android:useLevel="true" />
<corners android:radius="100dp" />

28
app/src/main/res/layout/activity_decoration_store.xml
View File

@@ -4,15 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
android:background="#F8F8FB"
android:orientation="vertical">
<com.nnbc123.app.base.TitleBar
android:id="@+id/title_bar"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30" />
android:background="@color/color_white">
<com.nnbc123.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_roll_view"
android:layout_width="match_parent"
@@ -35,8 +40,7 @@
<com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/view_indicator"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="@dimen/dp_10" />
android:layout_height="46dp" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
@@ -47,19 +51,19 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:baselineAligned="true"
android:background="@color/white"
android:baselineAligned="true"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:drawableStart="@drawable/ic_charge_diamond"
android:drawablePadding="3dp"
android:gravity="center"
android:includeFontPadding="false"
android:text="我的钻石"
android:layout_marginStart="15dp"
android:textColor="@color/color_999999"
android:textSize="12sp" />
@@ -67,9 +71,9 @@
android:id="@+id/tv_diamond_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:includeFontPadding="false"
android:layout_marginStart="4dp"
android:includeFontPadding="false"
android:text="0"
android:textColor="#ffffbc51"
android:textSize="16sp" />
@@ -82,10 +86,10 @@
android:id="@+id/tv_charge"
android:layout_width="72dp"
android:layout_height="24dp"
android:text="充值"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:layout_marginEnd="15dp"
android:text="充值"
android:textColor="@color/text_normal_282828"
android:textSize="12sp" />

25
app/src/main/res/layout/activity_my_decoration.xml
View File

@@ -10,19 +10,28 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22">
android:background="#F8F8FB">
<com.nnbc123.app.base.TitleBar
android:id="@+id/title_bar"
<FrameLayout
android:id="@+id/layout_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30" />
android:background="@color/color_white">
<com.nnbc123.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_roll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title_bar"
android:layout_below="@+id/layout_title_bar"
app:layout_constraintEnd_toEndOf="parent">
<com.nnbc123.app.ui.widget.rollviewpager.RollPagerView
@@ -37,13 +46,11 @@
tools:visibility="visible" />
</FrameLayout>
<com.nnbc123.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/view_indicator"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_below="@+id/fl_roll_view"
android:layout_marginTop="@dimen/dp_10" />
android:layout_height="46dp"
android:layout_below="@+id/fl_roll_view" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"

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

@@ -15,7 +15,7 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingStart="14dp"
android:paddingTop="15dp"
android:paddingTop="10dp"
android:paddingEnd="14dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

86
app/src/main/res/layout/item_car_garage_normal.xml
View File

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="carInfo"
type="com.nnbc123.core.decoration.car.bean.CarInfo" />
@@ -11,18 +12,17 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="120dp"
tools:background="@color/bg_normal_1c1b22"
>
tools:background="@color/bg_normal_1c1b22">
<FrameLayout
android:id="@+id/ll_car_cover"
android:layout_width="112dp"
android:orientation="vertical"
android:layout_height="80dp"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:padding="5dp"
android:background="@drawable/bg_secondary_radius_15"
android:layout_height="80dp" >
android:orientation="vertical"
android:padding="5dp">
<ImageView
android:id="@+id/iv_car_cover"
@@ -33,65 +33,67 @@
android:id="@+id/iv_tag"
android:layout_width="20dp"
android:layout_height="20dp"
tools:src="@drawable/ic_mark_limit"/>
tools:src="@drawable/ic_mark_limit" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_toStartOf="@id/tv_used"
android:layout_toEndOf="@id/ll_car_cover"
android:orientation="vertical">
<TextView
android:id="@+id/tv_car_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="left"
android:layout_toEndOf="@+id/ll_car_cover"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="10dp"
android:textColor="@color/text_title_282828"
android:singleLine="true"
android:drawableStart="@{carInfo.isGive ? @drawable/ic_send_tag : null}"
android:drawablePadding="5dp"
android:textSize="15sp"
android:gravity="left"
android:singleLine="true"
android:text="@{carInfo.name}"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
tools:text="神豪座驾" />
<TextView
android:id="@+id/tv_used"
android:layout_width="85dp"
android:layout_height="33dp"
android:id="@+id/tv_counters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:gravity="center"
android:textSize="14sp"
android:visibility="gone"
android:textColor="@color/text_title_282828"
tools:visibility="visible"
android:layout_marginEnd="@dimen/dp_15"
android:layout_alignTop="@id/tv_car_name"
android:layout_alignParentEnd="true"
tools:text="@string/label_can_use"
tools:background="@drawable/bg_common_confirm"/>
android:maxLines="1"
android:textColor="#696D7A"
android:textSize="11sp"
tools:text="- 1567天 -" />
</LinearLayout>
<TextView
android:id="@+id/tv_counters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/ll_car_cover"
android:layout_toEndOf="@id/ll_car_cover"
android:layout_marginStart="10dp"
android:layout_marginTop="24dp"
android:id="@+id/tv_used"
android:layout_width="78dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_13"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="- 1567天 -" />
android:textColor="#2B2D33"
android:textSize="13sp"
android:visibility="gone"
tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use"
tools:visibility="visible" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginEnd="15dp"
android:layout_marginStart="15dp"
android:background="@color/line_353548"/>
android:layout_marginEnd="15dp"
android:background="@color/line_353548" />
</RelativeLayout>
</layout>

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

@@ -102,7 +102,7 @@
android:drawablePadding="1dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/color_999999"
android:textColor="#696D7A"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

75
app/src/main/res/layout/item_my_head_wear.xml
View File

@@ -39,59 +39,64 @@
</FrameLayout>
<TextView
android:id="@+id/tv_car_name"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="22dp"
android:layout_marginEnd="10dp"
android:layout_toEndOf="@+id/ll_head_img"
android:drawableStart="@{headWearInfo.comeFrom==1?null:@drawable/ic_send_tag}"
android:drawablePadding="@dimen/dp_5"
android:text="@{headWearInfo.headwearName}"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
tools:text="神豪座驾" />
android:layout_centerVertical="true"
android:layout_marginStart="13dp"
android:layout_toStartOf="@id/tv_used"
android:layout_toEndOf="@id/ll_head_img"
android:orientation="vertical">
<TextView
android:id="@+id/tv_car_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@{headWearInfo.comeFrom==1?null:@drawable/ic_send_tag}"
android:drawablePadding="@dimen/dp_5"
android:text="@{headWearInfo.headwearName}"
android:textColor="@color/text_title_282828"
android:textSize="15sp"
tools:text="神豪座驾" />
<TextView
android:id="@+id/tv_counters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:drawablePadding="1dp"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:textColor="#696D7A"
android:textSize="11sp"
tools:text="剩余666天剩余666天剩余666天剩余666天剩余666天" />
</LinearLayout>
<TextView
android:id="@+id/tv_used"
android:layout_width="85dp"
android:layout_height="33dp"
android:layout_alignTop="@id/tv_car_name"
android:layout_width="78dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_15"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_13"
android:background="@{headWearInfo.used ? @drawable/bg_common_cancel : @drawable/bg_common_confirm}"
android:gravity="center"
android:text="@{headWearInfo.used ? @string/label_used : @string/label_can_use}"
android:textColor="@color/text_title_282828"
android:textSize="14sp"
android:textColor="#2B2D33"
android:textSize="13sp"
android:visibility="gone"
tools:background="@drawable/bg_common_confirm"
tools:text="@string/label_can_use"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_counters"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/ll_head_img"
android:layout_marginStart="15dp"
android:layout_toEndOf="@+id/ll_head_img"
android:drawablePadding="1dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/text_normal_282828"
android:textSize="12sp"
tools:text="剩余666天" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignEnd="@id/tv_used"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_toRightOf="@id/ll_head_img"
android:background="@color/line_353548" />
</RelativeLayout>

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

@@ -92,7 +92,7 @@
android:drawablePadding="1dp"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/color_999999"
android:textColor="#696D7A"
android:textSize="10sp"
app:layout_constraintBaseline_toBaselineOf="@id/tv_name"
app:layout_constraintStart_toEndOf="@id/tv_name"

14
app/src/module_bank_card/res/layout/item_nameplate_normal.xml
View File

@@ -50,15 +50,15 @@
<TextView
android:id="@+id/tv_used"
android:layout_width="64dp"
android:layout_height="20dp"
android:layout_width="78dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_13"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="11sp"
android:textColor="#2B2D33"
android:textSize="13sp"
android:visibility="gone"
tools:background="@drawable/bg_my_head_buy"
tools:text="@string/label_can_use"
@@ -74,8 +74,8 @@
android:layout_toEndOf="@id/ll_nameplate_cover"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/color_666666"
android:textSize="12sp"
android:textColor="#696D7A"
android:textSize="11sp"
tools:text="- 1567天 -" />
</RelativeLayout>