Skip to content

T
TangKuPos
Commit 7babafac authored by 姜敏's avatar 姜敏
Browse files
Options

添加颜色

parent adc99e4a
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 137 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 7babafac
......@@ -372,7 +372,7 @@ public class C {
*/
public final class VIP {
private static final String ROOT_URL = PKG + "user/";
public static final String query = PKG + "query";
public static final String query = ROOT_URL + "query";
}
}
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ 7babafac
......@@ -854,8 +854,8 @@ public final class ApiFactory {
.retryWhen(new RetryHelper(3));
}
public static Observable<Pager<Vip>> getVipList(int pageNumber) {
return Api.getInstance().service.getVipList(pageNumber, 12)
public static Observable<Pager<Vip>> getVipList(int pageNumber,String vipLevel) {
return Api.getInstance().service.getVipList(vipLevel,pageNumber, 12)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ 7babafac
......@@ -372,7 +372,7 @@ interface ApiService {
Observable<HttpMessage<Ver>> getLastVer(@Query("sn") String sn);
@POST(C.URL.VIP.query)
Observable<HttpMessage<Pager<Vip>>> getVipList(@Query("vipLevel") String keycode,
Observable<HttpMessage<Pager<Vip>>> getVipList(@Query("vipLevel") String vipLevel,
@Query("pageNumber") int pageNumber,
@Query("pageSize") int pageSize);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ 7babafac
package com.xingdata.zzdpos.ui.vip;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipBinding;
......@@ -13,10 +14,6 @@ import com.xingdata.zzdpos.ui.vip.fragment.VipTitleFragment;
import com.xingdata.zzdpos.util.OnClickListener;
public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> implements VipContract.View {
private VipListFragment vipListFragment = new VipListFragment();
private VipLevleFragment vipLevleFragment = new VipLevleFragment();
private VipTitleFragment vipTitleFragment = new VipTitleFragment();
@Override
public int getLayoutId() {
......@@ -26,9 +23,9 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void initView() {
loadRootFragment(R.id.vip_list_frame, vipListFragment, false, false);
loadRootFragment(R.id.vip_level_frame, vipLevleFragment, false, false);
loadRootFragment(R.id.vip_title_frame, vipTitleFragment, false, false);
loadRootFragment(R.id.vip_list_frame, mPresenter.vipListFragment, false, false);
loadRootFragment(R.id.vip_level_frame, mPresenter.vipLevleFragment, false, false);
loadRootFragment(R.id.vip_title_frame, mPresenter.vipTitleFragment, false, false);
}
......@@ -44,12 +41,13 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
mPresenter.vipLevleFragment.getVipLevelSus(levelPager);
}
@Override
public void getVipListSus(Pager<Vip> vipPager) {
public void getVipListSus(Pager<Vip> vipPager,int pageNumber) {
mPresenter.vipListFragment.getVipListSus(vipPager,pageNumber);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipContract.java
View file @ 7babafac
......@@ -16,14 +16,14 @@ public interface VipContract {
void getVipLevelSus(Pager<Level> levelPager);
void getVipListSus(Pager<Vip> vipPager);
void getVipListSus(Pager<Vip> vipPager,int pageNumber);
String getVipNumberSus();
}
abstract class Presenter extends BasePresenter<VipContract.View> {
public abstract void getVipList( int pageNumber, int vipLevel);
public abstract void getVipList( int pageNumber, String vipLevel);
public abstract void getVipLevel(int pageNum, int
pageSize);
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java
View file @ 7babafac
......@@ -3,10 +3,17 @@ package com.xingdata.zzdpos.ui.vip;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipLevleFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
import com.xingdata.zzdpos.ui.vip.fragment.VipTitleFragment;
public class VipPresenter extends VipContract.Presenter {
public VipInfoFragment vipInfoFragment = new VipInfoFragment();
public VipListFragment vipListFragment = new VipListFragment();
public VipLevleFragment vipLevleFragment = new VipLevleFragment();
public VipTitleFragment vipTitleFragment = new VipTitleFragment();
@Override
public void onAttached() {
......@@ -14,9 +21,9 @@ public class VipPresenter extends VipContract.Presenter {
@Override
public void getVipList(int pageNumber, int vipLevel) {
ApiFactory.User.getVipList(pageNumber).subscribe(vipPager -> {
mView.getVipListSus(vipPager);
public void getVipList(int pageNumber, String vipLevel) {
ApiFactory.User.getVipList(pageNumber,vipLevel).subscribe(vipPager -> {
mView.getVipListSus(vipPager,pageNumber);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java
View file @ 7babafac
......@@ -18,7 +18,6 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
@Override
public void initView() {
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipExpenseListFragment.java 0 → 100644
View file @ 7babafac
package com.xingdata.zzdpos.ui.vip.fragment;
/**
* Created by JM_DEV on 2017/12/21.
*/
import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechangeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import java.util.ArrayList;
import java.util.List;
/**
* 会员消费记录
*/
public class VipExpenseListFragment extends BaseFragment<VipPresenter, FragmentVipinfoBinding> {
private VipRechargeAdapter vipRechargeAdapter;
private List<VipRechangeOrder> orders = new ArrayList<>();
@Override
public int getLayoutId() {
return R.layout.fragment_vip_expense_list;
}
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("会员信息");
vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
}
private void onLoadMore() {
vipRechargeAdapter.addData(new VipRechangeOrder());
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.loadMoreComplete();
ToastUtils.showShort("刷新成功");
}
private void onRefresh() {
mViewBinding.rechargeRefresh.setRefreshing(false);
ToastUtils.showShort("刷新成功");
}
@Override
public boolean onBackPressedSupport() {
pop();
return true;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ 7babafac
......@@ -4,18 +4,12 @@ package com.xingdata.zzdpos.ui.vip.fragment;
* Created by JM_DEV on 2017/12/21.
*/
import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.FragmentVipinfoBinding;
import com.xingdata.zzdpos.model.VipRechangeOrder;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipRechargeAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import java.util.ArrayList;
import java.util.List;
......@@ -29,46 +23,36 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipinfoB
@Override
public int getLayoutId() {
return R.layout.fragment_vipinfo;
return R.layout.fragment_vip_expense_list;
}
@Override
public void initView() {
for (int i=0;i<10;i++){
orders.add(new VipRechangeOrder());
}
vipRechargeAdapter = new VipRechargeAdapter(getActivity(), orders);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(vipRechargeAdapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.rechargeRecyclerView);
mViewBinding.infoTitle.popMenu.setOnClickListener(view ->{
new VipEditMenuDialog().show((BaseActivity) getActivity());
});
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
ToastUtils.showShort("aaaaaaaaaa");
});
}
private void onLoadMore() {
vipRechargeAdapter.addData(new VipRechangeOrder());
vipRechargeAdapter.setEnableLoadMore(true);
vipRechargeAdapter.loadMoreComplete();
ToastUtils.showShort("刷新成功");
}
private void onRefresh() {
mViewBinding.rechargeRefresh.setRefreshing(false);
ToastUtils.showShort("刷新成功");
}
@Override
public boolean onBackPressedSupport() {
pop();
return true;
/**
* 弹出门店择器
*/
private void ShowPickerViewStoreAddress() {// 弹出选择器
// OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
// OptionsPickerView.OnOptionsSelectListener() {
// @Override
// public void onOptionsSelect(int options1, int options2, int options3, View v) {
//// String tx = list.get(options1).getPickerViewText();
//// mViewBinding.tvSelectStore.setText(tx);
//// shops = list.get(options1);
// }
// }).setTitleText("门店选择")
// .setDividerColor(Color.BLACK)
// .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
// .setContentTextSize(20)
// .build();
//
// pvOptions.setPicker(list);
// pvOptions.show();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java
View file @ 7babafac
......@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentViplevelTitleBinding;
......@@ -26,7 +27,7 @@ import com.xingdata.zzdpos.ui.vip.VipPresenter;
/**
* 会员等级列表
*/
public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> implements VipContract.View {
public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentViplevelTitleBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_viplevel_title;
......@@ -34,23 +35,26 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
@Override
public void initView() {
mPresenter.getVipLevel(0,200);
mPresenter.getVipLevel(0, 200);
}
/**
* 设置按钮选中
*
* @param b
* @param button
* @param buttonID
*/
private void setRadioButtonChecked(boolean b, RadioButton button) {
button.getPaint().setFakeBoldText(b);//字体加粗
if (b) {
button.setTextSize(17);
} else {
button.setTextSize(15);
private void setRadioButtonChecked(int buttonID) {
RadioButton radioButton= ((RadioButton) mViewBinding.vipLevelRadioGroup.findViewById(buttonID));
if (radioButton.isChecked()){
radioButton.getPaint().setFakeBoldText(true);
radioButton.setTextSize(17);
mPresenter.vipListFragment.setEnableLoadMore();
mPresenter.getVipList(0, radioButton.getTag().toString());
}else {
radioButton.setTextSize(15);
}
mPresenter.getVipList(0,Integer.parseInt(button.getTag().toString()));
}
@SuppressLint("ResourceAsColor")
......@@ -59,7 +63,6 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
radioButton.setTextSize(15);
radioButton.setText(level.getVipLevelName());
radioButton.setTag(level.getVipLevel());
setRadioButtonChecked(false, radioButton);
radioButton.setGravity(Gravity.CENTER);
radioButton.setButtonDrawable(null);
radioButton.getPaint().setFakeBoldText(true);
......@@ -69,41 +72,32 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
return radioButton;
}
@Override
public void addVip() {
}
@Override
public String addVipSus() {
return null;
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
layoutParams.height = 120;
layoutParams.width = LinearLayout.LayoutParams.MATCH_PARENT;
for (int i = 0; i < levelPager.getPageSize(); i++) {
mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams,levelPager.getList().get(i)));
mViewBinding.vipLevelRadioGroup.addView(addRadioButton(layoutParams, levelPager.getList().get(i)));
}
((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, n) -> {
mViewBinding.vipLevelRadioGroup.setOnCheckedChangeListener((radioGroup, id) -> {
mPresenter.vipListFragment.setVipLevel(mViewBinding.vipLevelRadioGroup.findViewById(id).getTag().toString());
for (int i = 0; i < mViewBinding.vipLevelRadioGroup.getChildCount(); i++) {
//动态设置按钮颜色
setRadioButtonChecked(i == n - 1, ((RadioButton) radioGroup.getChildAt(i)));
setRadioButtonChecked(id);
}
});
if (levelPager.getList().size()!=0){
((RadioButton) mViewBinding.vipLevelRadioGroup.getChildAt(0)).setChecked(true);
mPresenter.getVipList(0, mViewBinding.vipLevelRadioGroup.getChildAt(0).getTag().toString());
}
@Override
public void getVipListSus(Pager<Vip> vipPager) {
}
@Override
public String getVipNumberSus() {
return null;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ 7babafac
......@@ -6,6 +6,7 @@ package com.xingdata.zzdpos.ui.vip.fragment;
import android.support.v7.widget.LinearLayoutManager;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -23,11 +24,11 @@ import java.util.List;
/**
* 会员列表
*/
public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> implements VipContract.View {
public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
private VipListAdapter vipListAdapter;
private List<Vip> vips = new ArrayList<>();
private int inViplevel=0;
private String vipLevel;
private int pageNumber=0;
@Override
public int getLayoutId() {
......@@ -41,55 +42,50 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
((BaseActivity) getActivity()).start(new VipInfoFragment());
((BaseActivity) getActivity()).start(new VipExpenseListFragment());
});
vipListAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.vipRecyclerView);
vipListAdapter.setEnableLoadMore(true);
}
//
// public void getVipList(String strViplevel){
// mPresenter.getVipList(0, strViplevel);
// }
private void onLoadMore() {
Vip vip = new Vip();
vip.setVipName("张山");
vip.setVipMobile(13311221212L);
vip.setVipDefDiscount(80);
vipListAdapter.addData(vip);
vipListAdapter.loadMoreComplete();
mPresenter.getVipList(pageNumber,this.vipLevel);
}
private void onRefresh() {
// mPresenter.getVipList(inViplevel,0);
}
@Override
public void addVip() {
pageNumber = 0;
mPresenter.getVipList(pageNumber,vipLevel);
}
@Override
public String addVipSus() {
return null;
}
@Override
public void getVipLevelSus(Pager<Level> levelPager) {
}
@Override
public void getVipListSus(Pager<Vip> vipPager) {
public void getVipListSus(Pager<Vip> vipPager,int mPageNumber) {
vipListAdapter.loadMoreComplete();
mViewBinding.vipRefresh.setRefreshing(false);
if (vipPager.isFirstPage()) {
vips.clear();
if (mPageNumber == 0) {
vipListAdapter.getData().clear();
}
if (vipPager.isLastPage()) {
vipListAdapter.setEnableLoadMore(false);
vipListAdapter.notifyDataSetChanged();
}else {
pageNumber=0;
ToastUtils.showShort("没有更多数据");
return;
}
vipListAdapter.addData(vipPager.getList());
pageNumber=vipPager.getPageNumber()+1;
}
public void setVipLevel(String vipLevel) {
this.vipLevel = vipLevel;
}
@Override
public String getVipNumberSus() {
return null;
public void setEnableLoadMore(){
vipListAdapter.setEnableLoadMore(true);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTitleFragment.java
View file @ 7babafac
......@@ -25,8 +25,15 @@ public class VipTitleFragment extends BaseFragment<VipPresenter, FragmentViptitl
@Override
public void initView() {
mViewBinding.addButton.setOnClickListener(view -> {
mViewBinding.setOnClickListener(view -> {
switch (view.getId()){
case R.id.addVip:
((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
break;
}
});
mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
getActivity().finish();
});
}
}
app/src/main/res/drawable/selector_button_pop_background.xml 0 → 100644
View file @ 7babafac
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/blue_mawu" android:state_pressed="false" />
<item android:color="@color/black" android:state_pressed="true" />
</selector>
\ No newline at end of file
app/src/main/res/layout/dialog_vip_menu.xml
View file @ 7babafac
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<variable
name="onClick"
type="android.view.View.OnClickListener" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -16,11 +23,15 @@
android:orientation="vertical">
<TextView
android:id="@+id/editVip"
style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:onClick="@{onClick}"
android:text="编辑会员" />
<View
......@@ -33,7 +44,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:id="@+id/rechargeVip"
android:background="@color/white"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:text="充值会员" />
<View
......@@ -43,10 +57,14 @@
<TextView
style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content"
android:id="@+id/consumeList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white"
android:gravity="center"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:text="消费记录" />
......@@ -63,11 +81,14 @@
android:orientation="vertical">
<TextView
android:id="@+id/cancelButton"
style="@style/default_bluetext_popbutton"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dtail_hight_5"
android:background="@color/white"
android:foreground="?android:attr/actionBarItemBackground"
android:onClick="@{onClick}"
android:gravity="center"
android:text="取消" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vipinfo.xml → app/src/main/res/layout/fragment_vip_expense_list.xml
View file @ 7babafac
......@@ -21,10 +21,16 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<ImageView
android:background="@mipmap/mk_grade01"
android:layout_width="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
app/src/main/res/layout/fragment_viptitle.xml
View file @ 7babafac
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
......@@ -11,6 +12,7 @@
type="android.widget.RadioGroup.OnCheckedChangeListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
......@@ -24,6 +26,7 @@
android:orientation="horizontal">
<include
android:id="@+id/title_search"
layout="@layout/title_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -99,24 +102,23 @@
android:textStyle="bold" />
</LinearLayout>
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/white"
android:orientation="horizontal">
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/addVip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageButton
android:id="@+id/addButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
......@@ -131,7 +133,7 @@
android:textColor="@color/deep_red"
android:textSize="22sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
......
app/src/main/res/layout/title_search.xml
View file @ 7babafac
......@@ -15,11 +15,13 @@
<ImageView
android:layout_width="50dp"
android:id="@+id/onBack"
android:layout_height="match_parent"
android:background="@mipmap/go_back" />
<EditText
style="@style/editText"
android:id="@+id/serchEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="0dp"
......
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