Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

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

@@ -8,8 +8,15 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatFragment;
+import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.MyDbManager;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 import com.sheep.jiuyan.samllsheep.R;
 
+import org.xutils.ex.DbException;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -27,19 +34,38 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     TextView nameTv;
     @BindView(R.id.sheep_num_tv)
     TextView sheepNumTv;
+    @BindView(R.id.personalcenter_item_price_tv)
+    TextView personalcenter_item_price_tv;
     Unbinder unbinder;
 
+    private UserEntity userEntitys;
+
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
 
     }
 
+    private void initData() {
+
+        try {
+            userEntitys = MyDbManager.getInstance().dbFindUser();
+        } catch (DbException e) {
+            e.printStackTrace();
+        }
+        if(userEntitys != null){
+            personalcenter_item_price_tv.setText(userEntitys.getBalance()+" 元");
+            nameTv.setText(userEntitys.getNickname() + "");//绵羊号：123456789
+            sheepNumTv.setText("绵羊号：" + userEntitys.getInvitation_code());
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // TODO: inflate a fragment view
         View rootView = super.onCreateView(inflater, container, savedInstanceState);
         unbinder = ButterKnife.bind(this, rootView);
+        initData();
         return rootView;
     }
 
@@ -49,28 +75,34 @@ public class FgtPersonalCenter extends BaseCompatFragment {
         unbinder.unbind();
     }
 
-    @OnClick({R.id.icon_img_iv, R.id.personalcenter_price_layout, R.id.account_detail_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit})
+    @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_price_layout, R.id.account_safe_layout, R.id.account_task_layout, R.id.proxy_service_layout, R.id.abourt_us_layout, R.id.feedbook_layout, R.id.recommend_friend_layout, R.id.tv_submit})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.icon_img_iv:
-                break;
-            case R.id.personalcenter_price_layout:
+            case R.id.icon_img_iv://图片
+            case R.id.account_detail_layout://个人资料
+                Jump2View.getInstance().goPersionInfo(getActivity(), userEntitys);
                 break;
-            case R.id.account_detail_layout:
+            case R.id.personalcenter_price_layout://我的资产
+                Jump2View.getInstance().goMyMoney(getActivity(), null);
                 break;
             case R.id.account_safe_layout:
+                Jump2View.getInstance().goAccountAndSecurit(getActivity(), null);
+                UMConfigUtils.onEvent(UMConfigUtils.Event.USER_ACCOUNT_SAFE);
                 break;
-            case R.id.account_task_layout:
+            case R.id.account_task_layout://任务记录
+                Jump2View.getInstance().goTaskList2View(getActivity(), null);
+                UMConfigUtils.onEvent(UMConfigUtils.Event.USER_TASK_RECORD);
                 break;
-            case R.id.proxy_service_layout:
+            case R.id.proxy_service_layout://代理
                 break;
-            case R.id.abourt_us_layout:
+            case R.id.abourt_us_layout://关于我们
                 break;
-            case R.id.feedbook_layout:
+            case R.id.feedbook_layout://意见反馈
                 break;
-            case R.id.recommend_friend_layout:
+            case R.id.recommend_friend_layout://推荐给好友
                 break;
-            case R.id.tv_submit:
+            case R.id.tv_submit://注销
+                ((PersonalCenterAct)getActivity()).loginOut();
                 break;
         }
     }

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

@@ -418,8 +418,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 goWxfz();
                 break;
             case R.id.icon_layout://我的资产
-                Jump2View.getInstance().goMyMoney(activity, null);
-                break;
             case R.id.info_layout://其它信息
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -8,7 +8,16 @@ import android.view.KeyEvent;
 import android.widget.Toast;
 
 import com.sheep.gamegroup.util.ActivityManager;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.AccountAndSecurityAct;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.analytics.MobclickAgent;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+
+import java.util.Map;
 
 import butterknife.ButterKnife;
 
@@ -108,5 +117,60 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public abstract void initData();
 
+    /**
+     * 注销账户
+     */
+    public   void  loginOut(){
+        //登出
+
+        UMConfigUtils.onProfileSignOff();
+        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
+        UMShareAPI api=  UMShareAPI.get(this);
+        api.deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+
+        api.deleteOauth(this, SHARE_MEDIA.QQ, new UMAuthListener() {
+            @Override
+            public void onStart(SHARE_MEDIA platform) {
+            }
+
+            @Override
+            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
+            }
+
+            @Override
+            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
+                hideProgress();
+            }
+
+            @Override
+            public void onCancel(SHARE_MEDIA platform, int action) {
+                hideProgress();
+            }
+        });
+        SpUtils.login(this, "");
+        SpUtils.saveWeixin(this, "");
+        SpUtils.savePhone(this, "");
+        ActivityManager.getInstance().finishAllActivity();
+        Jump2View.getInstance().goLoginView(this,"");
+        finish();
+    }
 
 }

app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -181,60 +181,6 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         }
     }
 
-    private  void  loginOut(){
-        //登出
-
-        UMConfigUtils.onProfileSignOff();
-        UMConfigUtils.onEvent(UMConfigUtils.Event.USER_LOGOUT);
-        UMShareAPI api=  UMShareAPI.get(this);
-        api.deleteOauth(this, SHARE_MEDIA.WEIXIN, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                hideProgress();
-            }
-        });
-
-        api.deleteOauth(this, SHARE_MEDIA.QQ, new UMAuthListener() {
-            @Override
-            public void onStart(SHARE_MEDIA platform) {
-            }
-
-            @Override
-            public void onComplete(SHARE_MEDIA platform, int action, Map<String, String> data) {
-            }
-
-            @Override
-            public void onError(SHARE_MEDIA platform, int action, Throwable t) {
-                hideProgress();
-            }
-
-            @Override
-            public void onCancel(SHARE_MEDIA platform, int action) {
-                hideProgress();
-            }
-        });
-        SpUtils.login(this, "");
-        SpUtils.saveWeixin(this, "");
-        SpUtils.savePhone(this, "");
-        ActivityManager.getInstance().finishAllActivity();
-        Jump2View.getInstance().goLoginView(AccountAndSecurityAct.this,"");
-        finish();
-    }
-
-
     @Override
     public void NetSuccess(int code, String msg) {
         showToast(msg);

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalCenterAct.java

@@ -1,16 +1,15 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.os.Handler;
-import android.os.Message;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
-import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
+import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerPersonalCenterComponent;
 import com.sheep.gamegroup.di.modules.PersonalCenterModule;
@@ -18,52 +17,25 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.presenter.PersonalCenterContract;
 import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
-import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import javax.inject.Inject;
 
-import butterknife.BindView;
-import butterknife.OnClick;
-
 /**
  * 个人中心首页
  * Created by ljy on 2018/3/10.
  */
 
 public class PersonalCenterAct extends BaseActivity implements PersonalCenterContract.View{
-    @BindView(R.id.my_price)
-    TextView myPrice;
-    @BindView(R.id.my_all_price)
-    TextView myAllPrice;
-    @BindView(R.id.withdrawal)
-    TextView withdrawal;
-    @BindView(R.id.account_safe_layout)
-    RelativeLayout accountSafeLayout;
-    @BindView(R.id.account_task_layout)
-    RelativeLayout accountTaskLayout;
-    @BindView(R.id.account_detail_layout)
-    RelativeLayout accountDetailLayout;
 
     Activity activity;
     @Inject
     PersonalCenterPresenter presenter;
     UserEntity userEntity;
 
-    Handler mHanderl = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-
-            myPrice.setText(userEntity.getBalance()+" 元");
-            myAllPrice.setText("累计资产 "+userEntity.getTotal_asset()+" 元");
-        }
-    };
-
     @Override
     protected int getLayoutId() {
         return R.layout.personalcenter_act_layout;
@@ -81,8 +53,26 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
         TitleBarUtils
                 .getInstance()
                 .setTitle(this, "个人中心")
+                .setTitleColor(this, getResources().getColor(R.color.white))
+                .setTitleListen(this, R.drawable.narrow_back_white, null)
+                .setTitleBackgroud(this, R.drawable.sp_bg_gradient_blue_nocorners)
+                .setShowOrHideLine(this, false)
                 .setTitleFinish(this);
 
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        Bundle bundle = new Bundle();
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
+        if(fragment == null){
+            fragment = new FgtPersonalCenter();
+            fragment.setArguments(bundle);
+            transaction.add(R.id.frame_container, fragment, "tag");
+            transaction.commit();
+        }else {
+            fragment.setArguments(bundle);
+            transaction.replace(R.id.frame_container, fragment);
+            transaction.commit();
+        }
+
 
     }
 
@@ -97,34 +87,6 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
 
     }
 
-
-
-
-    @OnClick({R.id.my_price, R.id.my_all_price, R.id.withdrawal, R.id.account_safe_layout, R.id.account_task_layout, R.id.account_detail_layout})
-    public void onViewClicked(View view) {
-        switch (view.getId()) {
-            case R.id.my_price:
-                break;
-            case R.id.my_all_price:
-                break;
-            case R.id.withdrawal:
-                Jump2View.getInstance().goWithdrawal(activity, null);
-                break;
-            case R.id.account_safe_layout:
-                Jump2View.getInstance().goAccountAndSecurit(activity, null);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.USER_ACCOUNT_SAFE);
-                break;
-            case R.id.account_task_layout://任务记录
-                Jump2View.getInstance().goTaskList2View(activity, null);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.USER_TASK_RECORD);
-                break;
-            case R.id.account_detail_layout://提现明细
-                Jump2View.getInstance().goWithdrawallistView(activity, null);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.USER_TIXIAN_DETAIL);
-                break;
-        }
-    }
-
     @Override
     public void updateData2View(Object o) {
         Log.e("---getInfo-", o.toString());
@@ -141,7 +103,6 @@ public class PersonalCenterAct extends BaseActivity implements PersonalCenterCon
         } catch (Exception e) {
             e.printStackTrace();
         }
-        mHanderl.sendEmptyMessage(0);
     }
 
     @Override

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -100,7 +100,7 @@ public class TitleBarUtils {
         if (onClickListener != null) {
             imageView.setOnClickListener(onClickListener);
         }
-        return this;
+        return mTitleBarUtils;
     }
 
 
@@ -211,4 +211,24 @@ public class TitleBarUtils {
         activity.findViewById(R.id.layout_navigationBar)
                 .setVisibility(isShow ? View.VISIBLE : View.GONE);
     }
+
+
+    /**
+     * 隐藏线，GONE或VISIBLE
+     */
+    public TitleBarUtils setShowOrHideLine(Activity activity, boolean isShow) {
+        activity.findViewById(R.id.title_bottom_line)
+                .setVisibility(isShow ? View.VISIBLE : View.GONE);
+        return mTitleBarUtils;
+    }
+
+
+    /**
+     * 设置标题栏颜色
+     */
+    public TitleBarUtils setTitleBackgroud(Activity activity, int backgroundImgResId) {
+        activity.findViewById(R.id.layout_navigationBar)
+                .setBackground(activity.getResources().getDrawable(backgroundImgResId));
+        return mTitleBarUtils;
+    }
 }

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/blue_34a6e7"
+        android:endColor="@color/blue_start"/>
+
+</shape>

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

@@ -58,22 +58,23 @@
             android:id="@+id/personalcenter_item_price_iv"
             android:layout_width="@dimen/content_padding_20"
             android:layout_height="@dimen/content_padding_20"
-            android:src="@mipmap/x_ic_account_secuity"
+            android:src="@mipmap/personalc_ic_my_price"
             android:layout_marginRight="12dp"
             android:layout_centerVertical="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="帐号安全"
+            android:text="我的资产"
             android:lines="1"
             android:textColor="@color/black"
             android:textSize="14dp"
             android:layout_centerVertical="true" />
         <TextView
+            android:id="@+id/personalcenter_item_price_tv"
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="wrap_content"
-            android:text="帐号安全"
+            android:text=""
             android:lines="1"
             android:textColor="@color/txt_black_818181"
             android:textSize="14dp"

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

@@ -45,14 +45,6 @@
         android:layout_marginRight="15dp"
         />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/white_bg_line"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
-        />
-
     <RelativeLayout
         android:id="@+id/account_safe_layout"
         android:layout_width="match_parent"
@@ -87,6 +79,14 @@
 
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/white_bg_line"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        />
+
     <RelativeLayout
         android:id="@+id/account_task_layout"
         android:layout_width="match_parent"

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

@@ -8,177 +8,9 @@
     <include
         layout="@layout/title" />
 
-    <RelativeLayout
+    <FrameLayout
+        android:id="@+id/frame_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_margin="12dp"
-        android:padding="15dp">
-        <TextView
-            android:id="@+id/withdrawal"
-            style="@style/style_button"
-            android:layout_height="30dp"
-            android:layout_width="100dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:text="提 现"/>
-        <TextView
-            android:id="@+id/my_property"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="我的资产"
-            android:textColor="@color/black"
-            android:textSize="15dp"/>
-        <TextView
-            android:layout_below="@+id/my_property"
-            android:id="@+id/my_price"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/black"
-            android:textSize="25dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:layout_toLeftOf="@id/withdrawal"/>
-        <TextView
-            android:layout_below="@+id/my_price"
-            android:id="@+id/my_all_price"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:textColor="@color/black"
-            android:textSize="12dp"/>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="账户信息"
-            android:textColor="@color/black"
-            android:layout_margin="15dp"
-            android:textSize="15dp"/>
-        <RelativeLayout
-            android:id="@+id/account_safe_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="15dp"
-            android:gravity="center">
-            <ImageView
-                android:id="@+id/personalcenter_item_icon_iv"
-                android:layout_width="@dimen/content_padding_20"
-                android:layout_height="@dimen/content_padding_20"
-                android:src="@mipmap/x_ic_account_secuity"
-                android:layout_marginRight="12dp"
-                android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="帐号安全"
-                android:lines="1"
-                android:textColor="@color/black"
-                android:textSize="14dp"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@+id/personalcenter_item_icon_iv" />
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/x_ic_next"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="12dp"
-                android:layout_centerVertical="true"/>
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/white_bg_line"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            />
-
-        <RelativeLayout
-            android:id="@+id/account_task_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="15dp"
-
-            android:layout_alignParentStart="true">
-            <ImageView
-                android:id="@+id/tast_item_icon_iv"
-                android:layout_width="@dimen/content_padding_20"
-                android:layout_height="@dimen/content_padding_20"
-                android:src="@mipmap/x_ic_task_history"
-                android:layout_marginRight="12dp"
-                android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="任务记录"
-                android:lines="1"
-                android:textColor="@color/black"
-                android:textSize="14dp"
-                android:layout_alignBottom="@+id/tast_item_icon_iv"
-                android:layout_toEndOf="@+id/tast_item_icon_iv"
-                android:layout_centerVertical="true"/>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/x_ic_next"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="12dp"
-                android:layout_centerVertical="true"/>
-
-        </RelativeLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:background="@color/white_bg_line"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
-            />
-
-        <RelativeLayout
-            android:id="@+id/account_detail_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="15dp"
-         >
-            <ImageView
-                android:id="@+id/detail_item_icon_iv"
-                android:layout_width="@dimen/content_padding_20"
-                android:layout_height="@dimen/content_padding_20"
-                android:src="@mipmap/x_ic_withdrawal"
-                android:layout_marginRight="12dp"
-                android:layout_centerVertical="true"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="提现明细"
-                android:lines="1"
-                android:textColor="@color/black"
-                android:textSize="14dp"
-                android:layout_centerVertical="true"
-                android:layout_alignBottom="@+id/detail_item_icon_iv"
-                android:layout_toEndOf="@+id/detail_item_icon_iv" />
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/x_ic_next"
-                android:layout_alignParentRight="true"
-                android:layout_marginLeft="12dp"
-                android:layout_centerVertical="true"/>
-
-        </RelativeLayout>
-    </LinearLayout>
+        android:layout_height="match_parent"/>
 
 </LinearLayout>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/title_bottom_line"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">