diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index b000a89435..39c0ae202d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -255,12 +255,6 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } } - if (mConcernEntity.getLink() != null) { - viewHolder.link.setImageResource(R.drawable.ic_link); - } else { - viewHolder.link.setImageResource(R.drawable.concern_message_icon); - } - if (mConcernEntity.getBrief() != null) { viewHolder.content.setText(Html.fromHtml(mConcernEntity.getBrief())); viewHolder.content.setMaxLines(100); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java index 780f2ab003..353f9f4292 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java @@ -37,8 +37,6 @@ public class NewsDigestViewHolder extends BaseRecyclerViewHolder public TextView commentnum; @BindView(R.id.news_digest_share) public ImageView share; - @BindView(R.id.news_digest_link) - public ImageView link; public NewsDigestViewHolder(View itemView) { super(itemView); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java index fd0c00a049..5de1423dd4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/GameDetailKaiFuAdapter.java @@ -387,7 +387,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_blue_style); } else { if (day < curDay && !isNextMonth) { - viewHolder.itemView.setBackgroundColor(Color.parseColor("#30000000")); + viewHolder.itemView.setBackgroundColor(Color.parseColor("#05000000")); viewHolder.calendarHint.setBackgroundResource(R.drawable.kaifu_item_hint_gray); } else { viewHolder.itemView.setBackgroundDrawable(new ColorDrawable(0)); @@ -411,7 +411,6 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { break; } } - viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_b3b3b3_bg); viewHolder.calendarKaifu.setText(TextUtils.isEmpty(remark) ? calendarServer.size() > 1 ? "新服×" + calendarServer.size() : "新服" : remark); diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index 7f1c629d16..912035f43f 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -372,7 +372,6 @@ class ConcernAdapter extends BaseRecyclerAdapter { } viewHolder.comment.setVisibility(View.GONE); viewHolder.share.setVisibility(View.GONE); - viewHolder.link.setImageResource(R.drawable.ic_libao); viewHolder.read.setVisibility(View.VISIBLE); for (LibaoStatusEntity libaoStatusEntity : libaoStatusList) { @@ -428,7 +427,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { int views = concernEntity.getViews(); if (views == 0) { - viewHolder.read.setVisibility(View.GONE); + viewHolder.read.setVisibility(View.INVISIBLE); } else { viewHolder.read.setVisibility(View.VISIBLE); viewHolder.read.setText(String.format(Locale.getDefault(), "阅读 %d", views)); @@ -445,12 +444,6 @@ class ConcernAdapter extends BaseRecyclerAdapter { viewHolder.commentnum.setText(String.valueOf(commentnum)); } } - - if (concernEntity.getLink() != null) { - viewHolder.link.setImageResource(R.drawable.ic_link); - } else { - viewHolder.link.setImageResource(R.drawable.concern_message_icon); - } } private void initFooterViewHolder(FooterViewHolder viewHolder) { diff --git a/app/src/main/res/drawable-hdpi/ic_comment.png b/app/src/main/res/drawable-hdpi/ic_comment.png deleted file mode 100644 index 6bf67a5ff8..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_comment.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/share_icon_gray.png b/app/src/main/res/drawable-hdpi/share_icon_gray.png deleted file mode 100644 index ae53c90f89..0000000000 Binary files a/app/src/main/res/drawable-hdpi/share_icon_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_comment.png b/app/src/main/res/drawable-xhdpi/ic_comment.png new file mode 100644 index 0000000000..b957e23c71 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_comment.png differ diff --git a/app/src/main/res/drawable-xhdpi/login_qq_icon.png b/app/src/main/res/drawable-xhdpi/login_qq_icon.png index 802e421f52..34fd4a60fa 100644 Binary files a/app/src/main/res/drawable-xhdpi/login_qq_icon.png and b/app/src/main/res/drawable-xhdpi/login_qq_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/login_wechat_icon.png b/app/src/main/res/drawable-xhdpi/login_wechat_icon.png index 3ba1b474c5..bfbb6c5c63 100644 Binary files a/app/src/main/res/drawable-xhdpi/login_wechat_icon.png and b/app/src/main/res/drawable-xhdpi/login_wechat_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/login_weibo_icon.png b/app/src/main/res/drawable-xhdpi/login_weibo_icon.png index d582aa0c1b..52596e8c31 100644 Binary files a/app/src/main/res/drawable-xhdpi/login_weibo_icon.png and b/app/src/main/res/drawable-xhdpi/login_weibo_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/share_icon_gray.png b/app/src/main/res/drawable-xhdpi/share_icon_gray.png new file mode 100644 index 0000000000..d44dbc03b2 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/share_icon_gray.png differ diff --git a/app/src/main/res/drawable-hdpi/textview_b3b3b3_bg.xml b/app/src/main/res/drawable/textview_b3b3b3_bg.xml similarity index 100% rename from app/src/main/res/drawable-hdpi/textview_b3b3b3_bg.xml rename to app/src/main/res/drawable/textview_b3b3b3_bg.xml diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index a8479f58d4..7972206a28 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -70,7 +70,7 @@ android:layout_width = "match_parent" android:layout_height = "45dp" android:layout_below = "@+id/login_pass_rl" - android:layout_marginTop = "42dp" + android:layout_marginTop = "27dp" android:background = "@drawable/login_btn_bg" android:gravity = "center" android:text = "@string/login" diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index 546efcc571..3d4dbdb14b 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -33,7 +33,6 @@ + android:orientation = "vertical" > + android:layout_height = "wrap_content" + android:paddingBottom = "15dp" + android:paddingLeft = "20dp" + android:paddingRight = "20dp" + android:paddingTop = "15dp" > @@ -63,14 +66,15 @@ android:id = "@+id/news_digest_ll_img" android:layout_width = "match_parent" android:layout_height = "wrap_content" - android:orientation = "vertical" > - - + android:orientation = "vertical" + android:paddingLeft = "20dp" + android:paddingRight = "20dp" /> @@ -79,19 +83,25 @@ android:layout_width = "0dp" android:layout_height = "wrap_content" android:layout_weight = "1" + android:gravity = "center" android:textColor = "@color/hint" - android:textSize = "13sp" /> + android:textSize = "12sp" /> + + @@ -100,34 +110,23 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:textColor = "@color/hint" - android:textSize = "13sp" /> + android:textSize = "12sp" /> + + - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml index 086e3145df..1a6b8a7118 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -57,21 +57,21 @@