From f66c75a39e094486d23b84dc83be3b398c6a4bab Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Thu, 27 Aug 2020 18:26:47 +0800 Subject: [PATCH] d --- .../adapter/holder/ContentViewHolder.java | 50 ++--- .../kehu/activity/FpOrderInfoActivity.java | 9 + .../com/fenghoo/seven/widget/ItemProView.java | 204 ++++++++++++++---- .../main/res/drawable/shape_pro_tv_hui.xml | 7 + app/src/main/res/layout/dingdan_rv_two.xml | 7 +- app/src/main/res/layout/widget_pro_item.xml | 46 ++-- .../main/res/mipmap-hdpi/icon_pro_ima_cj.png | Bin 0 -> 2796 bytes .../main/res/mipmap-mdpi/icon_pro_ima_cj.png | Bin 0 -> 1852 bytes .../main/res/mipmap-xhdpi/icon_pro_ima_cj.png | Bin 0 -> 2517 bytes .../res/mipmap-xxhdpi/icon_pro_ima_cj.png | Bin 0 -> 5759 bytes .../res/mipmap-xxxhdpi/icon_pro_ima_cj.png | Bin 0 -> 5027 bytes app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 10 + 13 files changed, 237 insertions(+), 97 deletions(-) create mode 100644 app/src/main/res/drawable/shape_pro_tv_hui.xml create mode 100644 app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png create mode 100644 app/src/main/res/mipmap-mdpi/icon_pro_ima_cj.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_pro_ima_cj.png create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_pro_ima_cj.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/icon_pro_ima_cj.png diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java index c5bd288..f6d3671 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java @@ -10,45 +10,29 @@ import android.widget.TextView; import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.entity.markquestions; import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; +import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean; +import com.fenghoo.seven.widget.ItemProView; public class ContentViewHolder extends TypeAbstractViewHolder { - private TextView tv_question; - private EditText et_remarkquestion; + private ItemProView itemProView; public ContentViewHolder(View itemView) { super(itemView); - tv_question = (TextView) itemView.findViewById(R.id.tv_question); - et_remarkquestion = (EditText) itemView.findViewById(R.id.et_remarkquestion); + itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter); } + /** + * 页面逻辑 + * travel:1:已分配,2:已被抢,3:已进店,4:已成交 4种类型的条目 + * + * order_state:0:未成交,1:已成交 + * ygd_state:0:未被抢,1:已被抢 + * type:1:已回收,2:已成交 + */ + public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) { - public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) { - //1.根据Tag移除掉监听 - if (et_remarkquestion.getTag() instanceof TextWatcher) { - et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag()); - } - - final String markname = dataBean.getMarkname(); - final String answer = dataBean.getAnswer(); - String is_must = dataBean.getIs_must(); - if (is_must.equals("1")) { - tv_question.setText(position + "." + markname+" (必填)"); - } else { - tv_question.setText(position + "." + markname); - } - - et_remarkquestion.setText(answer); - - if (et_remarkquestion.getTag() != null && et_remarkquestion.getTag() instanceof TextWatcher) { - et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag()); - } - TextWatcher textWatcher = new textwatcher() { - @Override - public void afterTextChanged(Editable s) { - dataBean.setAnswer(s.toString()); - } - }; - - et_remarkquestion.addTextChangedListener(textWatcher); - et_remarkquestion.setTag(textWatcher); + /** + * 三个字段,有六种状态 + */ + itemProView.refresh("2"); } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java index e257faa..8526f01 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java @@ -145,3 +145,12 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis } } + +/** + * 页面逻辑 + * travel:1:已分配,2:已被抢,3:已进店,4:已成交 4种类型的条目 + * + * order_state:0:未成交,1:已成交 + * ygd_state:0:未被抢,1:已被抢 + * type:1:已回收,2:已成交 + */ diff --git a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java index ab616a6..42c2401 100644 --- a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java @@ -10,6 +10,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.fenghoo.seven.R; +import com.fenghoo.seven.main.activity.Main2Activity; +import com.fenghoo.seven.main.my.activity.PersonalProfileActivity; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -24,16 +26,20 @@ import androidx.annotation.Nullable; public class ItemProView extends FrameLayout { - private View mViewbottomline; - private TextView mTvtitle; - private ImageView mIvicon; - private View mViewtopline; - private String mTitle; - private int mIcon; - private boolean show_bottom_line; - private boolean show_top_line; - private int mIv_icon_01; - private ImageView iv_icon_01; + private int mIv_icon_01,mIv_icon_01_h; + private int mIv_icon_02,mIv_icon_02_h; + private int mIv_icon_03,mIv_icon_03_h; + private int mTv_item_pro_01,mTv_item_pro_01_h; + private int mTv_item_pro_02,mTv_item_pro_02_h; + private int mTv_item_pro_03,mTv_item_pro_03_h; + private int mView_line_01,mView_line_01_h; + private int mView_line_02,mView_line_02_h; + private int mView_line_03,mView_line_03_h; + private int mView_line_04,mView_line_04_h; + private ImageView iv_icon_01,iv_icon_02,iv_icon_03; + private TextView tv_item_pro_01,tv_item_pro_02,tv_item_pro_03; + private View view_line_01,view_line_02,view_line_03,view_line_04; + public ItemProView(@NonNull Context context) { super(context, null); @@ -51,20 +57,16 @@ public class ItemProView extends FrameLayout { private void initView(Context context, AttributeSet attrs) { LayoutInflater.from(context).inflate(R.layout.widget_pro_item, this, true); -// mViewbottomline = findViewById(R.id.view_bottom_line); -// mTvtitle = (TextView) findViewById(R.id.tv_title); -// mIvicon = (ImageView) findViewById(R.id.iv_icon); -// mViewtopline = findViewById(R.id.view_top_line); iv_icon_01 = (ImageView)findViewById(R.id.iv_icon_01); - ImageView iv_icon_02 = (ImageView)findViewById(R.id.iv_icon_02); - ImageView iv_icon_03 = (ImageView)findViewById(R.id.iv_icon_03); - TextView tv_item_pro_01 = (TextView)findViewById(R.id.tv_item_pro_01); - TextView tv_item_pro_02 = (TextView)findViewById(R.id.tv_item_pro_02); - TextView tv_item_pro_03 = (TextView)findViewById(R.id.tv_item_pro_03); - View view_bottom_line_01 = (View)findViewById(R.id.view_bottom_line_01); - View view_top_line_02 = (View)findViewById(R.id.view_top_line_02); - View view_bottom_line_03 = (View)findViewById(R.id.view_bottom_line_03); - View view_top_line_04 = (View)findViewById(R.id.view_top_line_04); + iv_icon_02 = (ImageView)findViewById(R.id.iv_icon_02); + iv_icon_03 = (ImageView)findViewById(R.id.iv_icon_03); + tv_item_pro_01 = (TextView)findViewById(R.id.tv_item_pro_01); + tv_item_pro_02 = (TextView)findViewById(R.id.tv_item_pro_02); + tv_item_pro_03 = (TextView)findViewById(R.id.tv_item_pro_03); + view_line_01 = (View)findViewById(R.id.view_line_01); + view_line_02 = (View)findViewById(R.id.view_line_02); + view_line_03 = (View)findViewById(R.id.view_line_03); + view_line_04 = (View)findViewById(R.id.view_line_04); initAttrs(attrs); setUpView(); @@ -78,19 +80,28 @@ public class ItemProView extends FrameLayout { private void initAttrs(AttributeSet attrs) { TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ItemProView); -// mTitle = typedArray.getString(R.styleable.ItemProView_title); -// mIcon = typedArray.getResourceId(R.styleable.ItemProView_icon, R.color.bg_gray); -// show_bottom_line = typedArray.getBoolean(R.styleable.ItemProView_show_bottom_line, false); -// show_top_line = typedArray.getBoolean(R.styleable.ItemProView_show_top_line, false); - - - mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.color.bg_gray); - - - - + mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan); + mIv_icon_01_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan_hui); + mIv_icon_02 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan); + mIv_icon_02_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan_hui); + mIv_icon_03 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan); + mIv_icon_03_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan_hui); + mTv_item_pro_01 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv); + mTv_item_pro_01_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv_hui); + mTv_item_pro_02 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv); + mTv_item_pro_02_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv_hui); + mTv_item_pro_03 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv); + mTv_item_pro_03_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv_hui); + mView_line_01 = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.colortheme); + mView_line_01_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.ffb1b1b1); + mView_line_02 = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.colortheme); + mView_line_02_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.ffb1b1b1); + mView_line_03 = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.colortheme); + mView_line_03_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.ffb1b1b1); + mView_line_04 = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.colortheme); + mView_line_04_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.ffb1b1b1); typedArray.recycle(); } @@ -98,14 +109,129 @@ public class ItemProView extends FrameLayout { * 设置视图状态 */ private void setUpView() { -// mViewtopline.setVisibility(show_top_line ? VISIBLE : GONE); -// mViewbottomline.setVisibility(show_bottom_line ? VISIBLE : GONE); -// mIvicon.setImageResource(mIcon); -// mTvtitle.setText(mTitle); - iv_icon_01.setImageResource(mIv_icon_01); + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + } + public void refresh(String stutas){ + + // iv_icon_01.setImageResource(mIv_icon_01); + + switch (stutas) { + case "1"://000三个字段的状态 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "2"://010 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + // tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_02.setText(""); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "3"://011 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + case "4"://101 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + case "5"://110 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_02.setText(""); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "6"://111 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + } } diff --git a/app/src/main/res/drawable/shape_pro_tv_hui.xml b/app/src/main/res/drawable/shape_pro_tv_hui.xml new file mode 100644 index 0000000..e2e79c4 --- /dev/null +++ b/app/src/main/res/drawable/shape_pro_tv_hui.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/dingdan_rv_two.xml b/app/src/main/res/layout/dingdan_rv_two.xml index fd00dcd..daaaf13 100644 --- a/app/src/main/res/layout/dingdan_rv_two.xml +++ b/app/src/main/res/layout/dingdan_rv_two.xml @@ -11,6 +11,9 @@ android:id="@+id/item_my_twitter" android:layout_width="300dp" android:layout_height="wrap_content" - app:iv_icon_01="@drawable/shape_pro_yuan"/> - + app:iv_icon_01="@drawable/shape_pro_yuan" + app:iv_icon_02="@drawable/shape_pro_yuan" + app:iv_icon_03="@drawable/shape_pro_yuan" + /> + diff --git a/app/src/main/res/layout/widget_pro_item.xml b/app/src/main/res/layout/widget_pro_item.xml index a7f08d8..2a58fad 100644 --- a/app/src/main/res/layout/widget_pro_item.xml +++ b/app/src/main/res/layout/widget_pro_item.xml @@ -20,9 +20,9 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" + android:text="已被抢" - android:textColor="#ff2680eb" + android:textSize="12sp" /> + /> @@ -67,9 +67,7 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" android:text="已进店" - android:textColor="#ff2680eb" android:textSize="12sp" /> + /> + + + /> + - @@ -117,9 +117,9 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" + android:text="已成交" - android:textColor="#ff2680eb" + android:textSize="12sp" /> + /> + /> diff --git a/app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000000000000000000000000000000000000..53ed18043afa047686bc70ca446d9d15beba7311 GIT binary patch literal 2796 zcmVNk=l1o{+hSk`+N6y z@9(}Zgw94GlP^73m9FTuTn6cSS)!{MW0?Rl2rzcG{CxVI0U-bt#PGEy(O%L}tUx<- z{BR#P-Xb-YFVx|W(+lOSoQanc*bE|?2w*q>!}$bEw{0bapy8kfRxHW-jb*C+-*A!E z-o70InOWezTbAJBkq1EPwo&Kz1{z~HMMRI6In&n11!ShPK3zg+A%V?3zkTm{>lwhn z)TKn)vNC7is+K22MP#P)bh-q2IRP^O=z89i|A`$H2KuWU3O-u0qgHw`ml*>)f7X2Pwb%-C5T z#)8dW_`;ooGJmoacU^17u__gF-}0cmGNzJA1cEYvrj|L=N(j@LoSox-h9r6v3<?X7@!Gxso_yce zeC)*;I^FNSp0z( zVHFskZNQ4@HkcAjHPt>154`EYf$t&-pU*&h6{g)x7rUyaGKRMS*5xW~w-6TwBKL%1 z*fM>D2~ST+iU}kqDi>|7rG-QU#u!>BgEv15;@NFJ0pvA9^mt}U5{!*Nnsfw%4yX?@ zZk`wh8L$~8)CDy}8aJ!;Ya&e?`aW?W0TzO!n@rg*_n(O2zJ#x$#ezdmqzO8$+U3U| zi~SvL6%UX+Z{EJX4#%s{((IPuMl6|X!|@swc`Iv0^z&Tl4Flmw`#CbnNZ5Rj9Y!5t z!RC7GKB@>Coi`<6+6WVhOG7Al&j)uans*5Yf|IhH?gP}&{&jgY0lB>-jBQ`>cD4O6 zYLFh&t}w-n$TI;AYd#J{IauSz@YWmSb)GV@E05 z;Z}*d*Go46$pKK~5Qn}HL;kut9BV<}F`0V2a%+mXh+rdKxjyAIUbLkicaO1PV5*GA z-u2?<;YN(SNRJgee0XVRpxG}@Sx#L};fTgiQlTQ%On738S5TYpb^kaE?)ixsAC`nM zF53W`kwoArX&BoMhw$J83qC3j)=2vD}O@+5)! zcIthM3Go)2SZCZY%!n7J*|6`pf`{L(hfxn~nqxhwRCCG`0ZX>|MBZyX zE=-XGWlztg-!wcJT~eFt+|D1m}BRA&l4EmLe$1tNsHUJ%Zv^ zBk*0VhF|0war1B!mKXc*w*w*ZD8V%#zYIS1pHOi3YaVftD`(hnNygbu_nR6O8}
Xeq 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 xQl$v}r2=%iMD(LjvX-gh(!Q@aX?JZ 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e012c12..1ca26bd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ @color/colorWhite @color/colorGreen #3288EE + #ffb1b1b1 #999999 #ffffff #CCCCCC diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 596d5ea..e4389ff 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -117,5 +117,15 @@ + + + + + + + + + +