Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
kehaoyuan
2017-05-08 18:37:07 +08:00
41 changed files with 378 additions and 488 deletions

View File

@ -8,6 +8,7 @@ import android.graphics.*;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.*;
@ -374,7 +375,7 @@ public class MessageShareUtils {
layoutParams.setMargins(0, DisplayUtils.dip2px(context, 10), 0, 0);
shareLabel.setLayoutParams(layoutParams);
shareLabel.setGravity(Gravity.CENTER);
shareLabel.setTextColor(context.getResources().getColor(R.color.text_3a3a3a));
shareLabel.setTextColor(ContextCompat.getColor(context, R.color.text_3a3a3a));
shareLabel.setTextSize(marImg);
linearLayout.addView(shareLogo);