Skip to content

T
TangKuPos
Commit fdd03cfd authored by 王海's avatar 王海
Browse files
Options

修改UI

parent 1eacc40a
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 25 deletions
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java
View file @ fdd03cfd
...@@ -30,7 +30,7 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter, ...@@ -30,7 +30,7 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则"); mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
View file @ fdd03cfd
...@@ -67,7 +67,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter, ...@@ -67,7 +67,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则"); mViewBinding.icTitle.tvTitle.setText("获取积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
View file @ fdd03cfd
...@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter; ...@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter; import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -50,7 +49,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter, ...@@ -50,7 +49,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则"); mViewBinding.icTitle.tvTitle.setText("获取积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
...@@ -90,6 +89,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter, ...@@ -90,6 +89,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
case R.id.rb_get: { case R.id.rb_get: {
mViewBinding.rbGet.getPaint().setFakeBoldText(true); mViewBinding.rbGet.getPaint().setFakeBoldText(true);
mViewBinding.rbExchange.getPaint().setFakeBoldText(false); mViewBinding.rbExchange.getPaint().setFakeBoldText(false);
mViewBinding.icTitle.tvTitle.setText("获取积分规则");
showView(v.getId()); showView(v.getId());
mPresenter.query(1, NORMAL_TYPE, null); mPresenter.query(1, NORMAL_TYPE, null);
} }
...@@ -97,6 +97,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter, ...@@ -97,6 +97,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
case R.id.rb_exchange: { case R.id.rb_exchange: {
mViewBinding.rbGet.getPaint().setFakeBoldText(false); mViewBinding.rbGet.getPaint().setFakeBoldText(false);
mViewBinding.rbExchange.getPaint().setFakeBoldText(true); mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
showView(v.getId()); showView(v.getId());
LoadingDialog loadingDialog = new LoadingDialog(); LoadingDialog loadingDialog = new LoadingDialog();
loadingDialog.show((BaseActivity) getActivity()); loadingDialog.show((BaseActivity) getActivity());
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketContract.java
View file @ fdd03cfd
...@@ -19,6 +19,7 @@ public interface SendTicketContract { ...@@ -19,6 +19,7 @@ public interface SendTicketContract {
void error(String errorMsg, LoadingDialog loadingDialog); void error(String errorMsg, LoadingDialog loadingDialog);
/** /**
*
* 加载会员列表 * 加载会员列表
* *
* @param vips 会员列表 * @param vips 会员列表
......
app/src/main/res/drawable/up_down_line_gray_bottom.xml 0 → 100644
View file @ fdd03cfd
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:right="-2dp"
android:top="-2dp">
<shape>
<solid android:color="@color/gray_zhouyu"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_gray_top.xml 0 → 100644
View file @ fdd03cfd
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:bottom="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@color/gray_zhouyu"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_white_bottom.xml 0 → 100644
View file @ fdd03cfd
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:top="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@android:color/white"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_white_top.xml 0 → 100644
View file @ fdd03cfd
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:bottom="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@android:color/white"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @ fdd03cfd
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu" android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:text="基本信息" android:text="基本信息"
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:minHeight="@dimen/list1_height"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
...@@ -156,7 +157,7 @@ ...@@ -156,7 +157,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu" android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:text="兑换条件" android:text="兑换条件"
...@@ -209,9 +210,9 @@ ...@@ -209,9 +210,9 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray1"></View> android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ fdd03cfd
...@@ -47,30 +47,21 @@ ...@@ -47,30 +47,21 @@
android:orientation="vertical"> android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu" android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_bounced_padding" android:paddingLeft="@dimen/all_bounced_padding"
android:text="基本信息" android:text="基本信息"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/text_secondary_title"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:id="@+id/ll_rules_name" android:id="@+id/ll_rules_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/list1_height"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
...@@ -109,7 +100,7 @@ ...@@ -109,7 +100,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/list1_height"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
...@@ -188,6 +179,7 @@ ...@@ -188,6 +179,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/list1_height"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
...@@ -237,12 +229,19 @@ ...@@ -237,12 +229,19 @@
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/up_down_line_white" android:background="@color/white"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/list1_height"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
...@@ -250,6 +249,8 @@ ...@@ -250,6 +249,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
android:drawableLeft="@mipmap/point"
android:drawablePadding="@dimen/all_bounced_spacing"
android:paddingLeft="@dimen/all_bounced_padding" android:paddingLeft="@dimen/all_bounced_padding"
android:text="获取方式:" android:text="获取方式:"
android:textColor="@color/black" android:textColor="@color/black"
...@@ -322,6 +323,12 @@ ...@@ -322,6 +323,12 @@
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_height"
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_spacing"
android:background="@color/gray_huanggai"></View>
<LinearLayout <LinearLayout
android:id="@+id/ll_all" android:id="@+id/ll_all"
...@@ -434,7 +441,7 @@ ...@@ -434,7 +441,7 @@
android:id="@+id/ll_category" android:id="@+id/ll_category"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/up_down_line_white" android:background="@drawable/up_down_line_white_bottom"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
...@@ -443,6 +450,7 @@ ...@@ -443,6 +450,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
...@@ -542,6 +550,7 @@ ...@@ -542,6 +550,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
...@@ -593,6 +602,7 @@ ...@@ -593,6 +602,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
...@@ -641,6 +651,7 @@ ...@@ -641,6 +651,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:minHeight="@dimen/list1_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
......
app/src/main/res/layout/dialog_prompt.xml
View file @ fdd03cfd
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:textSize="@dimen/text_three_title" android:textSize="@dimen/text_three_title"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:background="@drawable/up_down_line_white"
android:text="系统提示" android:text="系统提示"
android:textColor="@color/black_baozheng"/> android:textColor="@color/black_baozheng"/>
......
app/src/main/res/layout/fragment_integral_main.xml
View file @ fdd03cfd
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<RadioGroup <RadioGroup
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/up_down_line_white" android:background="@drawable/up_down_line_white_bottom"
android:checkedButton="@id/rb_get" android:checkedButton="@id/rb_get"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
......
app/src/main/res/values/dimens.xml
View file @ fdd03cfd
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<dimen name="dialog_button_width">190dp</dimen> <dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框--> <!--提示对话框-->
<dimen name="prompt_dialog_width">300dp</dimen> <dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">200dp</dimen> <dimen name="prompt_dialog_height">220dp</dimen>
<dimen name="prompt_dialog_logo_size">48dp</dimen> <dimen name="prompt_dialog_logo_size">48dp</dimen>
<!--商品页面--> <!--商品页面-->
<integer name="fragment_store_product_item_span_count">4</integer> <integer name="fragment_store_product_item_span_count">4</integer>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment