diff --git a/app/src/main/java/com/gh/common/util/KaiFuUtils.java b/app/src/main/java/com/gh/common/util/KaiFuUtils.java index cf6cd5b427..d12ccf47af 100644 --- a/app/src/main/java/com/gh/common/util/KaiFuUtils.java +++ b/app/src/main/java/com/gh/common/util/KaiFuUtils.java @@ -1,149 +1,29 @@ package com.gh.common.util; -import android.graphics.Color; -import android.view.View; +import android.support.v4.content.ContextCompat; import android.widget.TextView; import com.gh.gamecenter.R; -import com.gh.gamecenter.entity.GameEntity; -import com.gh.gamecenter.entity.KaiFuServerEntity; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Locale; /** * Created by khy on 2017/3/19. */ public class KaiFuUtils { - public static void setKaiFuTimeHint(long curTime, long lastTime, GameEntity entity, boolean isTop) { - - SimpleDateFormat format = new SimpleDateFormat("dd", Locale.getDefault()); - String curDay = format.format(curTime); - String lastDay = format.format(lastTime); - if (!curDay.equals(lastDay)) { - if (isTop) { - entity.setKaifuTimeHint(curTime); - } else { - entity.setKaifuTimeHint(lastTime); - } - } - } - - public static void initKaiFuTimeHintView(TextView view, Long time) { - SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault()); - try { - long today = format.parse(format.format(new Date())).getTime(); - if (time >= today && time < today + 86400 * 1000) { - view.setText("↓今天开服"); - view.setTextColor(Color.parseColor("#ffb13c")); - } else if (time >= today - 86400 * 1000 && time < today) { - view.setText("↑历史开服"); - view.setTextColor(Color.parseColor("#c7c7c7")); - } else if (time > today && time < today + 86400 * 1000 * 2) { - view.setText("↓明天开服"); - view.setTextColor(Color.parseColor("#ffb13c")); - } else if (time < today) { - view.setText("↑历史开服"); - view.setTextColor(Color.parseColor("#c7c7c7")); - } else if (time > today && time < today + 86400 * 1000 * 3) { - view.setText("↓后天开服"); - view.setTextColor(Color.parseColor("#c7c7c7")); - } else { - format.applyPattern("↓M月d日开服"); - view.setText(format.format(time)); - view.setTextColor(Color.parseColor("#c7c7c7")); - } - } catch (ParseException e) { - e.printStackTrace(); - format.applyPattern("M月d日开服"); - view.setText(format.format(time)); - } - } - - public static void setKaiFuTimeHint(TextView top, TextView bottom, List gameList, int position) { - if (position == 0 || position + 1 >= gameList.size()) return; - - GameEntity curGameEntity = gameList.get(position); - GameEntity lastGameEntity = gameList.get(position); - KaiFuServerEntity curServerEntity = curGameEntity.getServerEntity(); - KaiFuServerEntity lastServerEntity = lastGameEntity.getServerEntity(); - - if (curServerEntity == null || lastServerEntity == null) return; - - long curTime = curServerEntity.getTime() * 1000; - long lastTime = lastServerEntity.getTime() * 1000; - SimpleDateFormat format = new SimpleDateFormat("dd", Locale.getDefault()); - String curDay = format.format(curTime); - String lastDay = format.format(lastTime); - if (!curDay.equals(lastDay)) { - - bottom.setVisibility(View.VISIBLE); - } else { - bottom.setVisibility(View.GONE); - } - } - - public static void setKaiFuTime(TextView textView, long time) { - time = time * 1000; - SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.getDefault()); - try { - long today = format.parse(format.format(new Date())).getTime(); - if (time >= today && time < today + 86400 * 1000) { - format.applyPattern("HH:mm"); - textView.setText(String.format("今天 %s", format.format(time))); - textView.setBackgroundResource(R.drawable.border_white_bg); - textView.setTextColor(Color.parseColor("#ffb13c")); - } else if (time >= today - 86400 * 1000 && time < today) { - format.applyPattern("HH:mm"); - textView.setText(String.format("昨天 %s", format.format(time))); - textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray); - textView.setTextColor(Color.parseColor("#c7c7c7")); - } else if (time > today && time < today + 86400 * 1000 * 2) { - format.applyPattern("HH:mm"); - textView.setText(String.format("明天 %s", format.format(time))); - textView.setBackgroundResource(R.drawable.border_white_bg); - textView.setTextColor(Color.parseColor("#ffb13c")); - } else if (time >= today - 86400 * 1000 * 2 && time < today) { - format.applyPattern("HH:mm"); - textView.setText(String.format("前天 %s", format.format(time))); - textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray); - textView.setTextColor(Color.parseColor("#c7c7c7")); - } else if (time > today && time < today + 86400 * 1000 * 3) { - format.applyPattern("HH:mm"); - textView.setText(String.format("后天 %s", format.format(time))); - textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray); - textView.setTextColor(Color.parseColor("#c7c7c7")); - } else { - format.applyPattern("MM-dd HH:mm"); - textView.setText(format.format(time)); - textView.setBackgroundResource(R.drawable.kaifu_time_tag_gray); - textView.setTextColor(Color.parseColor("#c7c7c7")); - } - } catch (ParseException e) { - e.printStackTrace(); - format.applyPattern("yyyy年MM月dd日 HH:mm"); - textView.setText(format.format(time)); - } - } - public static void setKaiFuType(TextView textView, String type) { textView.setText(type); switch (type) { case "不删档内测": - textView.setBackgroundColor(Color.parseColor("#9a9a9a")); + textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content)); break; case "删档内测": - textView.setBackgroundColor(Color.parseColor("#9a9a9a")); + textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.content)); break; case "公测": - textView.setBackgroundColor(Color.parseColor("#ffb13c")); + textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow)); break; default: - textView.setBackgroundColor(Color.parseColor("#ffb13c")); + textView.setBackgroundColor(ContextCompat.getColor(textView.getContext(), R.color.tag_yellow)); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 231bccc821..5dbbdb7c4e 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.support.design.widget.AppBarLayout; import android.support.v4.app.Fragment; +import android.support.v4.content.ContextCompat; import android.support.v4.view.ViewPager; import android.text.TextUtils; import android.view.LayoutInflater; @@ -322,7 +323,7 @@ public class GameDetailActivity extends BaseActivity { if (mGameDetailEntity.getUserData() != null && mGameDetailEntity.getUserData().isGameConcerned()) { mGameConcern.setText("取消关注"); mGameConcern.setBackgroundResource(R.drawable.border_red_bg); - mGameConcern.setTextColor(Color.parseColor("#ff4147")); + mGameConcern.setTextColor(ContextCompat.getColor(this, R.color.red)); } else { mGameConcern.setText("关注"); mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style); @@ -548,7 +549,7 @@ public class GameDetailActivity extends BaseActivity { mGameConcern.setText("取消关注"); mGameConcern.setBackgroundResource(R.drawable.border_red_bg); - mGameConcern.setTextColor(Color.parseColor("#ff4147")); + mGameConcern.setTextColor(ContextCompat.getColor(GameDetailActivity.this, R.color.red)); toast("关注成功"); mGameConcern.setEnabled(true); diff --git a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java index d134b45de3..9c23dd8fdd 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java @@ -284,8 +284,7 @@ public class ShareCardPicActivity extends BaseActivity { // 获取scrollview实际高度 for (int i = 0; i < scrollView.getChildCount(); i++) { h += scrollView.getChildAt(i).getHeight(); - scrollView.getChildAt(i).setBackgroundColor( - Color.parseColor("#ffffff")); + scrollView.getChildAt(i).setBackgroundColor(Color.WHITE); } // 创建对应大小的bitmap diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java index 9822c06bf8..79858394a6 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhWfifActivity.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; -import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.annotation.NonNull; @@ -17,11 +16,9 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; -import com.halo.assistant.HaloApp; import com.gh.base.BaseActivity; import com.gh.common.util.DialogUtils; import com.gh.common.util.RandomUtils; -import com.lightgame.utils.Utils; import com.gh.gamecenter.entity.KcWebRequestEntity; import com.gh.gamecenter.kuaichuan.Constant; import com.gh.gamecenter.kuaichuan.DownloadUriHandler; @@ -31,6 +28,8 @@ import com.gh.gamecenter.kuaichuan.ImageUriHandler; import com.gh.gamecenter.kuaichuan.KcUriHandler; import com.gh.gamecenter.kuaichuan.WifiMgr; import com.gh.gamecenter.receiver.WifiAPBroadcastReceiver; +import com.halo.assistant.HaloApp; +import com.lightgame.utils.Utils; import java.io.IOException; import java.io.InputStream; @@ -198,7 +197,7 @@ public class ShareGhWfifActivity extends BaseActivity { mInitStatusIcon.setVisibility(View.VISIBLE); mInitStatusIcon.setImageResource(R.drawable.hotspot_failed_icon); mInitStatusTv.setText("初始化失败， 请退出重试"); - mInitStatusTv.setTextColor(Color.parseColor("#ff4147")); + mInitStatusTv.setTextColor(ContextCompat.getColor(this, R.color.red)); mInitHotpostHint.setVisibility(View.VISIBLE); mInitHotspostPb.setVisibility(View.GONE); break; diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AreaAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/AreaAdapter.java deleted file mode 100644 index acb52abbac..0000000000 --- a/app/src/main/java/com/gh/gamecenter/adapter/AreaAdapter.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.gh.gamecenter.adapter; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.text.TextUtils; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.gh.common.util.LoginUtils; -import com.gh.gamecenter.R; -import com.gh.gamecenter.adapter.viewholder.AreaViewHolder; -import com.gh.gamecenter.entity.LocalEntity; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.utils.Utils; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; - -/** - * Created by khy on 23/06/17. - */ - -public class AreaAdapter extends BaseRecyclerAdapter { - - private OnAreaCallBackListener mCallBackLintener; - - private List mLocalList; - private List mProList; - private String mCurArea; - - public AreaAdapter(Context context, List proList, OnAreaCallBackListener callBackLintener) { - super(context); - mCallBackLintener = callBackLintener; - mLocalList = new ArrayList<>(); - mProList = proList; - mCurArea = LoginUtils.getUserInfo(mContext).getRegion(); - if (mProList == null) { - initData(); - } - } - - private void initData() { - String locList = ""; - try { - InputStreamReader inputReader = new InputStreamReader(mContext.getAssets().open("LocList.txt")); - BufferedReader bufReader = new BufferedReader(inputReader); - String line; - while ((line = bufReader.readLine()) != null) { - locList += line; - } - } catch (IOException e) { - e.printStackTrace(); - } - - Utils.log("locList::" + locList); - - if (!TextUtils.isEmpty(locList)) { - Type listType = new TypeToken>() { - }.getType(); - List localList = new Gson().fromJson(locList, listType); - mLocalList.addAll(localList); - notifyDataSetChanged(); - } - } - - @Override - public int getItemViewType(int position) { - if (mProList != null) { - return 0; - } - String name = mLocalList.get(position).getName(); - if (("国内".equals(name) || "国外".equals(name))) { - return 1; - } - return 0; - } - - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - if (viewType == 0) { - return new AreaViewHolder(mLayoutInflater.inflate(R.layout.area_item, parent, false)); - } else { - return new AreaTitleViewHolder(mLayoutInflater.inflate(R.layout.area_title_item, parent, false)); - } - } - - @Override - public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) { - LocalEntity localEntity = null; - if (mProList == null) { - localEntity = mLocalList.get(position); - } - if (holder instanceof AreaViewHolder) { - final AreaViewHolder viewHolder = (AreaViewHolder) holder; - - if (localEntity != null) { - List city = localEntity.getCity(); - if (city != null && city.size() > 0) { - viewHolder.areaMore.setVisibility(View.VISIBLE); - } else { - viewHolder.areaMore.setVisibility(View.GONE); - if (!TextUtils.isEmpty(mCurArea) && mCurArea.contains(localEntity.getName())) { - viewHolder.areaSelect.setVisibility(View.VISIBLE); - } else { - viewHolder.areaSelect.setVisibility(View.GONE); - } - } - viewHolder.areaName.setText(localEntity.getName()); - } else { - viewHolder.areaMore.setVisibility(View.GONE); - viewHolder.areaName.setText(mProList.get(position)); - if (!TextUtils.isEmpty(mCurArea) && mCurArea.contains(mProList.get(position))) { - viewHolder.areaSelect.setVisibility(View.VISIBLE); - } else { - viewHolder.areaSelect.setVisibility(View.GONE); - } - } - - - final LocalEntity finalLocalEntity = localEntity; - viewHolder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (viewHolder.areaMore.getVisibility() == View.VISIBLE) { - mCallBackLintener.onAreaResult(finalLocalEntity.getName(), finalLocalEntity.getCity()); - } else { - - String area; - if (mProList != null) { - area = mProList.get(holder.getAdapterPosition()); - } else { - area = finalLocalEntity.getName(); - } - - mCallBackLintener.onAreaResult(area, null); - } - - } - }); - } else if (holder instanceof AreaTitleViewHolder) { - ((AreaTitleViewHolder) holder).name.setText(localEntity.getName()); - } - } - - @Override - public int getItemCount() { - if (mProList != null) { - return mProList.size(); - } - return mLocalList.size(); - } - - class AreaTitleViewHolder extends RecyclerView.ViewHolder { - TextView name; - - public AreaTitleViewHolder(View itemView) { - super(itemView); - name = (TextView) itemView; - } - } - - public interface OnAreaCallBackListener { - void onAreaResult(String area, List cityList); - } -} diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 2e8a7a1c8b..0c6baccbae 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Environment; import android.support.v4.content.ContextCompat; @@ -221,7 +220,7 @@ public class CleanApkAdapter extends BaseRecyclerAdapter holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } else { holder.gameSize.setText("未安装"); - holder.gameSize.setTextColor(Color.parseColor("#ff4147")); + holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.red)); } if (mIsScanOver) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java index 9364233270..b3e8570407 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsTypeListAdapter.java @@ -4,6 +4,7 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.StateListDrawable; +import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; @@ -40,9 +41,9 @@ public class GameNewsTypeListAdapter extends BaseRecyclerAdapter { , 0, DisplayUtils.dip2px(mContext, 10)); holder.newsList.removeAllViews(); - if (mLibaoEntity.getContent() != null && position == 1) { + if (mLibaoEntity.getContent() != null && position == 1) { // TODO 抽出 xml holder.newsTitle.setText("礼包内容"); TextView textView = new TextView(mContext); textView.setTextColor(Color.parseColor("#717171")); @@ -305,14 +305,6 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { eTime.setLayoutParams(params); } -// int repeat = mLibaoEntity.getRepeat(); -// if (repeat > 0) { -// TextView tvRepeat = new TextView(mContext); -// tvRepeat.setTextColor(Color.parseColor("#717171")); -// tvRepeat.setText(StringUtils.buildString("领取次数：每人最多可以领取", String.valueOf(repeat), "次（每天0点刷新）")); -// holder.newsList.addView(tvRepeat); -// tvRepeat.setLayoutParams(params); -// } } else if (mLibaoDetailEntity.getDes() != null && position == getItemCount() - 2) { holder.newsTitle.setText("使用说明"); TextView desTv = new TextView(mContext); diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index b8d2a355b8..ad0ed9b7f2 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -959,7 +959,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { holder.more.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } else { holder.more.setText("全部"); - holder.more.setTextColor(Color.parseColor("#676767")); + holder.more.setTextColor(ContextCompat.getColor(mContext, R.color.game_list_all)); } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 932ff3fa0b..c9cd1f834a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -343,7 +343,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { int day = entity.getDay(); if (day == curDay && !isNextMonth) { viewHolder.calendarDay.setText("今天"); - viewHolder.calendarDay.setTextColor(Color.parseColor("#FF4147")); + viewHolder.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.red)); viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_blue_style); } else { if (day < curDay && !isNextMonth) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java index 6facc80f22..15c995bd10 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java @@ -1,8 +1,8 @@ package com.gh.gamecenter.gamedetail; import android.content.Context; -import android.content.res.ColorStateList; import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.view.View; import android.view.ViewGroup; @@ -70,26 +70,14 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter { params.setMargins(0, 0, 0, 0); } viewHolder.itemView.setLayoutParams(params); - viewHolder.itemView.setBackgroundColor(Color.parseColor("#f8f8f8")); + viewHolder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.libao_history_bg)); viewHolder.libaoName.setText(libaoEntity.getName()); viewHolder.libaoDes.setText(libaoEntity.getContent()); @@ -157,25 +157,13 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { //领取状态 if (!TextUtils.isEmpty(libaoEntity.getStatus())) { if (libaoEntity.getStatus().equals("linged")) { - int[][] states = new int[2][]; - states[0] = new int[]{android.R.attr.state_pressed}; - states[1] = new int[]{}; - int[] colors = new int[]{Color.WHITE, - Color.parseColor("#06D0A8")}; - ColorStateList sl = new ColorStateList(states, colors); viewHolder.libaoBtnStatus.setText("已领取"); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.libao_linged_style); - viewHolder.libaoBtnStatus.setTextColor(sl); + viewHolder.libaoBtnStatus.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_linged_selector)); } else { - int[][] states2 = new int[2][]; - states2[0] = new int[]{android.R.attr.state_pressed}; - states2[1] = new int[]{}; - int[] colors2 = new int[]{Color.WHITE, - Color.parseColor("#ffb13c")}; - ColorStateList sl2 = new ColorStateList(states2, colors2); viewHolder.libaoBtnStatus.setText("已淘号"); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.libao_taoed_style); - viewHolder.libaoBtnStatus.setTextColor(sl2); + viewHolder.libaoBtnStatus.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_taoed_selector)); } } else { viewHolder.libaoBtnStatus.setTextColor(Color.WHITE); diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 4a65847f44..9dda258037 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -310,7 +310,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { if (mNewsDetailEntity.getUserData() != null && mNewsDetailEntity.getUserData().isGameConcerned()) { viewHolder.gamedetailConcern.setText("取消关注"); viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.border_red_bg); - viewHolder.gamedetailConcern.setTextColor(Color.parseColor("#ff4147")); + viewHolder.gamedetailConcern.setTextColor(ContextCompat.getColor(mContext, R.color.red)); } else { viewHolder.gamedetailConcern.setText("关注"); viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.textview_concern_red_style); @@ -343,7 +343,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setText("取消关注"); concern.setBackgroundResource(R.drawable.border_red_bg); - concern.setTextColor(Color.parseColor("#ff4147")); + concern.setTextColor(ContextCompat.getColor(mContext, R.color.red)); Toast.makeText(mContext, "关注成功", Toast.LENGTH_SHORT).show(); viewHolder.gamedetailConcern.setEnabled(true); @@ -529,7 +529,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { , DisplayUtils.dip2px(mContext, 1)); params.setMargins(DisplayUtils.dip2px(mContext, 10), 0, DisplayUtils.dip2px(mContext, 10), 0); view.setLayoutParams(params); - view.setBackgroundColor(Color.parseColor("#ededed")); + view.setBackgroundColor(ContextCompat.getColor(mContext, R.color.cutting_line)); linearLayout.addView(view); TextView textView = new TextView(mContext); @@ -538,7 +538,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { , ViewGroup.LayoutParams.WRAP_CONTENT)); textView.setText("查看全部评论（" + mCommentNum + "）"); textView.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12)); - textView.setTextColor(Color.parseColor("#00B7FA")); + textView.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); textView.setTextSize(16); linearLayout.addView(textView); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java index d460b2e962..66bac892cf 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchHistoryFragmentAdapter.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.search; import android.content.Context; -import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -15,9 +14,9 @@ import android.widget.TextView; import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; -import com.lightgame.adapter.BaseRecyclerAdapter; import com.gh.gamecenter.db.SearchHistoryDao; import com.gh.gamecenter.eventbus.EBSearch; +import com.lightgame.adapter.BaseRecyclerAdapter; import org.greenrobot.eventbus.EventBus; @@ -69,7 +68,7 @@ class SearchHistoryFragmentAdapter extends BaseRecyclerAdapter { viewHolder.textView.setText(historyList.get(position)); if (!mIsHistory && position < 3) { - viewHolder.textView.setTextColor(Color.parseColor("#FDA34D")); + viewHolder.textView.setTextColor(ContextCompat.getColor(mContext, R.color.type_gonggao)); } else { viewHolder.textView.setTextColor(ContextCompat.getColor(mContext, R.color.title)); } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 710cb9504c..7e4ce30155 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -48,8 +48,16 @@ #30000000 #1668d0 - + + #59d3ff + + #717171 + + #676767 + + #f8f8f8 + #ff4147 #aaaaaa #dcdcdc