首页修改、审核修改

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -18,10 +18,12 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -40,7 +42,9 @@ import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BulletinEnty;
+import com.sheep.gamegroup.model.entity.CashAwarsEntity;
 import com.sheep.gamegroup.model.entity.Ext;
+import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.RecyleObj;
@@ -61,6 +65,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.NestedScrollView;
@@ -74,8 +79,6 @@ import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
-import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
-import com.sheep.gamegroup.view.fragment.FgtMyGame;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -164,6 +167,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     ViewPagerAutoHeigh mViewPager;
     @BindView(R.id.tabLayout)
     TabLayout tabLayout;
+    @BindView(R.id.homepage_item_get_award_name_tv)
+    TextView homepage_item_get_award_name_tv;
+    @BindView(R.id.homepage_item_money_tv)
+    TextView homepage_item_money_tv;
+    @BindView(R.id.homepage_item_juan_tv)
+    TextView homepage_item_juan_tv;
 
 
     @Inject
@@ -340,10 +349,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     tabLayout.post(new Runnable() {
                         @Override
                         public void run() {
-                            toolBarPositionY = tabLayout.getHeight();
-                            ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                            params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight()+1;
-                            mViewPager.setLayoutParams(params);
+                            int count = mViewPager.getChildCount();
+                            if(count > 0){
+                                toolBarPositionY = tabLayout.getHeight();
+//                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
+                                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
+                                params.height = G.getRealPix(count * 50);
+                                mViewPager.setLayoutParams(params);
+                                LogUtil.logE("--------"+count+";height:"+mViewPager.getHeight()+","+mViewPager.getMeasuredHeight());
+                            }
+
                         }
                     });
                 } catch (Exception e) {
@@ -494,6 +509,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
+                if(o != null){
+                    CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
+                }
             }
         });
         adpViewPagerDetail.cleanListFragment();
@@ -532,8 +550,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, activity);
         home_list_gridview_listview.setAdapter(adpHomeListListview);
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
-    }
 
+        home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if(null ==  homeListEntitysGridview.get(position)){
+                    return;
+                }
+                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
+                UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
+                if(homeListEntity.getJump().equals("-2")){
+                    setValueList(!homeListEntity.isSelect());
+                    homeListEntity.setSelect(!homeListEntity.isSelect());
+                }else {
+                    CommonUtil.getInstance()
+                            .goWhere(activity, homeListEntity, "首页");
+                }
+                adpHomeListGrideview.notifyDataSetChanged();
+            }
+        });
+    }
     private void refreshTaskList() {
         DataUtil.getInstance().isTaskListChange(getClass());
         tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
@@ -1137,9 +1173,42 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntity.setDesc("新手任务");
             homeListEntity.setJump("-1");
             homeListEntity.setIcon(R.mipmap.homepage_xinshourw+"");
-            homeListEntitysGridview.set(0, homeListEntity);
+            homeListEntitys.add(0, homeListEntity);
 
         }
+        if(homeListEntitys.size() > 8){
+            HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("查看更多");
+            homeListEntity.setDesc("查看更多");
+            homeListEntity.setJump("-2");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntitys.add(7, homeListEntity);
+        }
         onResumeCount++;
+        setValueList(false);
+    }
+
+    private void setValueList(boolean flag) {
+        homeListEntitysGridview.clear();
+        for(int i=0;i<homeListEntitys.size();i++){
+            if(flag){
+                homeListEntitysGridview.add(homeListEntitys.get(i));
+            }else {
+                if(i<8){
+                    homeListEntitysGridview.add(homeListEntitys.get(i));
+                }
+            }
+
+        }
+        if(homeListEntitysGridview.size() > 8){
+            HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("查看更多");
+            homeListEntity.setDesc("查看更多");
+            homeListEntity.setJump("-2");
+            homeListEntity.setSelect(flag);
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntitysGridview.set(7, homeListEntity);
+        }
+        adpHomeListGrideview.notifyDataSetChanged();
     }
 }

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -16,7 +16,7 @@ import com.sheep.jiuyan.samllsheep.R;
  */
 
 public enum MainTab {
-    FgtSmallSheep(R.string.mine_hoggerel) {
+    FgtSmallSheep(R.string.main_tab_make_money) {
         @Override
         public Fragment getFragment() {
             return new FgtSmallSheep();

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -17,6 +17,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.ArrayList;
@@ -106,8 +107,10 @@ public class TabsHelper {
                         view_pager_container.setCurrentItem(position, false);
                         int sheepPosition = MainTab.FgtSmallSheep.ordinal();
                         int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
+                        int auditPosition = MainTab.FgtMainAudit.ordinal();
                         FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
                         FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
+                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(personnalPosition);
                         if(position == sheepPosition){
                             fgtSmallSheep.onResume();
                         } else {
@@ -116,6 +119,9 @@ public class TabsHelper {
                         if(position == personnalPosition){
                             personnalCenter.onResume();
                         }
+                        if(position == auditPosition){
+                            auditFgt.onResume();
+                        }
                         checkWhichPage(position);
                     }
 

app/src/main/java/com/sheep/gamegroup/model/entity/CashAwarsEntity.java

@@ -0,0 +1,38 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ *
+ * Created by ljy on 2018/8/21.
+ */
+
+public class CashAwarsEntity implements Serializable {
+    private String welfare;//: 27994,
+    private String award;//: 47504.47,
+    private String cash;//: 19510.47
+
+    public String getWelfare() {
+        return welfare;
+    }
+
+    public void setWelfare(String welfare) {
+        this.welfare = welfare;
+    }
+
+    public String getAward() {
+        return award;
+    }
+
+    public void setAward(String award) {
+        this.award = award;
+    }
+
+    public String getCash() {
+        return cash;
+    }
+
+    public void setCash(String cash) {
+        this.cash = cash;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/HomeListEntity.java

@@ -20,6 +20,15 @@ public class HomeListEntity {
     private int IsHot;//	   int	  `orm:"column(is_hot);null" description:"是否是热门标签 0:不是 1:是"`
     private String UpdateTime;//	integer ($int64)更新时间
     private String Url;//	integer ($int64)更新时间
+    private boolean select;
+
+    public boolean isSelect() {
+        return select;
+    }
+
+    public void setSelect(boolean select) {
+        this.select = select;
+    }
 
     public String getUrl() {
         return Url;

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpHomeListGrideview.java

@@ -68,16 +68,8 @@ public class AdpHomeListGrideview extends BaseAdapter {
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
         Glide.with(context)
                 .load(entity.getId() == 0 ? Integer.valueOf(entity.getIcon()) : entity.getIcon())
-                .apply(new RequestOptions().dontAnimate())
+                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /2, G.WIDTH /4 /2))
                 .into(holder.gridview_item_icon_iv);
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                UMConfigUtils.IdEvent.HOME_LIST.commit(entity.getId());
-                CommonUtil.getInstance()
-                        .goWhere(context, entity, "首页");
-            }
-        });
         return convertView;
     }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -85,8 +85,16 @@ public class TaskListItemAdp extends BaseAdapter {
             return convertView;
         }
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
-        ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
-        holder.price_tv.setText(returnValue(ety));
+        ViewUtil.setText(holder.date_tv, "提交时间:"+TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
+        String stateStr = "";
+        if(ety.getStatus() == 3){
+            stateStr = "+"+ ety.getRelease_task().getBonus() +"元";
+            holder.price_tv.setTextColor(context.getResources().getColor(R.color.txt_red));
+        }else {
+            stateStr = ety.getRelease_task().getBonus() +"元";
+            holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
+        }
+        holder.price_tv.setText(stateStr);
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -94,7 +102,7 @@ public class TaskListItemAdp extends BaseAdapter {
             }
         });
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
-        holder.detail_task_tv.setText(ety.getRemarks());
+        holder.detail_task_tv.setText(returnValue3(ety, holder.detail_task_tv));
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
@@ -141,4 +149,31 @@ public class TaskListItemAdp extends BaseAdapter {
         }
         return stateStr;
     }
+    private String returnValue3(TaskAcceptedEty ety, TextView textView){
+        String stateStr = "已接受任务";
+        switch (ety.getStatus()){
+            default:
+            case 1://提交中
+            case 2:
+            case 7:
+                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_x);
+                textView.setTextColor(context.getResources().getColor(R.color.btn_color_main_stroke));
+                textView.setText("审核中");
+                break;
+            case 3://完成
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setText("已完成");
+                break;
+            case 4://失败
+            case 5:
+            case 6:
+            case 8:
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_x);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
+                textView.setText("重新提交");
+                break;
+        }
+        return stateStr;
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -12,6 +13,8 @@ import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -41,6 +44,8 @@ public class FgtMainAudit extends BaseCompatFragment {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
+    @BindView(R.id.my_money_dingxiang_amount_iv)
+    ImageView my_money_dingxiang_amount_iv;
     Unbinder unbinder;
     private Activity activity;
 
@@ -65,6 +70,14 @@ public class FgtMainAudit extends BaseCompatFragment {
         new_tab();
         initData();
 
+        my_money_dingxiang_amount_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                ViewUtil.showOrienteeringDetails(activity);
+            }
+        });
+
     }
 
     @Override
@@ -85,6 +98,8 @@ public class FgtMainAudit extends BaseCompatFragment {
                         String audit_total_money = String.format(activity.getResources().getString(R.string.audit_total_money), taskAuditEntity.getFinish_cash());
                         String audit_total_welfare = String.format(activity.getResources().getString(R.string.audit_total_welfare), taskAuditEntity.getWelfare_award());
 
+                        if(numberTv == null)
+                            return;
                         numberTv.setText(audit_total_audit+"");
                         auditTotalCompleteTv.setText(audit_total_complete+"");
                         auditTotalMoneyTv.setText(audit_total_money+"");
@@ -120,5 +135,16 @@ public class FgtMainAudit extends BaseCompatFragment {
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        try {
+            initData();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 

app/src/main/res/drawable/shape_blue_stroke_rectangle_x.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#2EBEF2" />
+</shape>

app/src/main/res/drawable/shape_gray_stroke_rectangle_x.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#CCCCCC" />
+</shape>

app/src/main/res/layout/act_audit_layout.xml

@@ -87,15 +87,32 @@
                 android:layout_height="20dp"
                 android:layout_gravity="center"
                 android:background="@color/disenable_color"/>
-            <TextView
-                android:id="@+id/audit_total_welfare_tv"
+
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text=""
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_13"/>
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/audit_total_welfare_tv"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_size_13" />
+
+                <ImageView
+                    android:id="@+id/my_money_dingxiang_amount_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_gravity="right"
+                    android:padding="10dp"
+                    android:src="@mipmap/question_mark" />
+            </LinearLayout>
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 

app/src/main/res/layout/adp_homelist_gridview_new.xml

@@ -2,11 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/content_padding_10"
-    android:paddingEnd="@dimen/content_padding_10"
-    android:paddingStart="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10">
+    android:orientation="horizontal">
 
     <LinearLayout
         android:id="@+id/linearlayout"
@@ -18,8 +14,8 @@
 
         <ImageView
             android:id="@+id/gridview_item_icon_iv"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:src="@mipmap/home_try_play_circle_bg"/>
 
@@ -38,7 +34,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="试玩赚钱"
-        android:textSize="8sp"
+        android:textSize="7sp"
         android:textColor="@color/black_6_3"
         android:layout_toRightOf="@+id/linearlayout"/>
 </RelativeLayout>

app/src/main/res/layout/homepage_item_get_award.xml

@@ -12,7 +12,8 @@
         android:id="@+id/homepage_item_get_award_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/homepage_item_jiangli"/>
+        android:src="@mipmap/homepage_item_jiangli"
+        android:paddingTop="@dimen/content_padding_2"/>
 
     <TextView
         android:id="@+id/homepage_item_get_award_name_tv"
@@ -28,7 +29,7 @@
         android:id="@+id/homepage_item_money_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="1234324"
+        android:text=""
         app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"

app/src/main/res/layout/homepage_item_gridview_listview.xml

@@ -17,9 +17,9 @@
         android:scrollbars="none"
         android:numColumns="4"
         android:listSelector="@color/transparent"
-        android:verticalSpacing="@dimen/content_padding_8"
-        android:horizontalSpacing="@dimen/content_padding_8"
-        android:layout_marginBottom="@dimen/content_padding_8"/>
+        android:verticalSpacing="@dimen/content_padding_5"
+        android:horizontalSpacing="@dimen/content_padding_5"
+        android:layout_marginBottom="@dimen/content_padding_5"/>
 
     <com.sheep.gamegroup.util.MyListview
         android:id="@+id/home_list_gridview_listview"

app/src/main/res/layout/homepage_item_notice_and_currenttime.xml

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
 
     <ImageView

app/src/main/res/values/str_appstore_strings.xml

@@ -21,6 +21,7 @@
     <string name="main_tab_find">发现</string>
     <string name="main_tab_audit">审核</string>
     <string name="main_tab_invite">邀请</string>
+    <string name="main_tab_make_money">赚钱</string>
 
     <string name="hot_person_game">人气游戏</string>
     <string name="best_game">精品游戏</string>

app/src/main/res/values/strings.xml

@@ -19,7 +19,7 @@
     <string name="agent_extract">推广提成余额：%s元</string>
     <string name="recharge_amount">充值余额：%s元</string>
     <string name="available_amount">可提现金额：%s元</string>
-    <string name="dingxiang_amount">定向货币余额：%s元</string>
+    <string name="dingxiang_amount">福利余额：%s元</string>
 
     <string name="rechargeq_amount">当前绵羊币余额：%s元</string>
 
@@ -82,8 +82,8 @@
     <string name="cancel">取消</string>
 
     <string name="audit_total_audit">%s\n审核中</string>
-    <string name="audit_total_complete">%s个\n累计完成</string>
-    <string name="audit_total_money">%s元\n累计现金</string>
-    <string name="audit_total_welfare">%s元\n累计完成</string>
+    <string name="audit_total_complete">%s个\n\n累计完成</string>
+    <string name="audit_total_money">%s元\n\n累计现金</string>
+    <string name="audit_total_welfare">%s元\n\n累计福利</string>
     <string name="my_invitation_str">我的邀请码:%s</string>
 </resources>

view/src/main/res/values/colors.xml

@@ -74,5 +74,7 @@
     <color name="black_6_e">#eeeeee</color>
     <color name="gray_F0F0F0">#F0F0F0</color>
     <color name="yellow_D3AF57">#D3AF57</color>
+    <color name="red_FD2D54">#FD2D54</color>
+    <color name="gray_CCCCCC">#CCCCCC</color>
 
 </resources>