diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index 82743832f6..9b2e4b8d1e 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -156,7 +156,7 @@ public class NewsUtils { } else { textView.setText(String.format(Locale.getDefault(), "%d小时前", hour)); } - } else if (day >= today - 86400 * 1000 && day < today) { + } else if (day >= today - 86400 * 1000 * 100 && day < today) { format.applyPattern("HH:mm"); textView.setText("昨天 "); } else { diff --git a/app/src/main/java/com/gh/common/view/GridDivider.java b/app/src/main/java/com/gh/common/view/GridDivider.java index 7c919baf50..bbc6760599 100644 --- a/app/src/main/java/com/gh/common/view/GridDivider.java +++ b/app/src/main/java/com/gh/common/view/GridDivider.java @@ -20,6 +20,8 @@ public class GridDivider extends RecyclerView.ItemDecoration { private int mDividerHight = 1; private int mGridCount; + private boolean mIsFilterLast; + /* int dividerHight 分割线的线宽 int dividerColor 分割线的颜色 @@ -32,6 +34,15 @@ public class GridDivider extends RecyclerView.ItemDecoration { mColorPaint.setColor(dividerColor); } + public GridDivider(Context context, int dividerHight, int gridCount, int dividerColor, boolean isFilterLast) { + this(context); + mDividerHight = dividerHight; + mGridCount = gridCount; + mColorPaint = new Paint(); + mColorPaint.setColor(dividerColor); + mIsFilterLast = isFilterLast; + } + public GridDivider(Context context) { final TypedArray ta = context.obtainStyledAttributes(ATRRS); this.mDividerDarwable = ta.getDrawable(0); @@ -60,6 +71,7 @@ public class GridDivider extends RecyclerView.ItemDecoration { final int childCount = parent.getChildCount(); for (int i = 0; i < childCount; i++) { + if (mIsFilterLast && i == childCount - 1) continue; final View child = parent.getChildAt(i); RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); 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 39c0ae202d..fa67b95fbe 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -45,7 +45,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import java.util.Timer; import java.util.TimerTask; @@ -244,15 +243,13 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { private void initNewsDigestViewHolder(final NewsDigestViewHolder viewHolder) { if (mConcernEntity.getViews() != 0) { - viewHolder.read.setText(String.format(Locale.getDefault(), "阅读 %d", mConcernEntity.getViews())); + viewHolder.readNum.setText(String.valueOf(mConcernEntity.getViews())); } - if (mConcernEntity.getCommentnum() != 0) { - if (mConcernEntity.getCommentnum() > 999) { - viewHolder.commentnum.setText(R.string.thousand); - } else { - viewHolder.commentnum.setText(String.valueOf(mConcernEntity.getCommentnum())); - } + if (mConcernEntity.getCommentnum() > 999) { + viewHolder.commentnum.setText(R.string.thousand); + } else { + viewHolder.commentnum.setText(String.valueOf(mConcernEntity.getCommentnum())); } if (mConcernEntity.getBrief() != null) { 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 a4918c54bc..895eafd8ed 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 @@ -29,20 +29,22 @@ public class NewsDigestViewHolder extends BaseRecyclerViewHolder public TextView content; @BindView(R.id.news_digest_ll_img) public LinearLayout imgLayout; - @BindView(R.id.news_digest_read) - public TextView read; + @BindView(R.id.news_digest_read_icon) + public View readIcon; + @BindView(R.id.news_digest_read_num) + public TextView readNum; @BindView(R.id.news_digest_comment) public LinearLayout comment; @BindView(R.id.news_digest_commentnum) public TextView commentnum; @BindView(R.id.news_digest_share) public ImageView share; - @BindView(R.id.news_digest_line1) - public View line1; - @BindView(R.id.news_digest_line2) - public View line2; - @BindView(R.id.news_digest_libao) - public View libaoIcon; + @BindView(R.id.news_digest_hint) + public ImageView iconHint; + @BindView(R.id.news_digest_libao_hint) + public TextView mLibaoHint; + @BindView(R.id.news_digest_count_container) + public View countContainer; public NewsDigestViewHolder(View itemView) { super(itemView); 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 3e1ce7ea1b..dc4cb5f43d 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -42,7 +42,6 @@ import org.json.JSONObject; import java.util.ArrayList; import java.util.List; -import java.util.Locale; import io.reactivex.ObservableEmitter; import io.reactivex.ObservableOnSubscribe; @@ -370,13 +369,10 @@ class ConcernAdapter extends BaseRecyclerAdapter { viewHolder.content.setText(StringUtils.buildString(concernEntity.getName(), "(限", PlatformUtils.getInstance(mContext) .getPlatformName(concernEntity.getPlatform()), "版)\n礼包内容:", content)); } - viewHolder.comment.setVisibility(View.INVISIBLE); - viewHolder.share.setVisibility(View.INVISIBLE); - viewHolder.line1.setVisibility(View.INVISIBLE); - viewHolder.line2.setVisibility(View.INVISIBLE); - viewHolder.read.setVisibility(View.VISIBLE); viewHolder.imgLayout.setVisibility(View.GONE); - viewHolder.libaoIcon.setVisibility(View.VISIBLE); + viewHolder.iconHint.setImageResource(R.drawable.ic_libao); + viewHolder.countContainer.setVisibility(View.GONE); + viewHolder.mLibaoHint.setVisibility(View.VISIBLE); for (LibaoStatusEntity libaoStatusEntity : libaoStatusList) { if (TextUtils.isEmpty(libaoStatusEntity.getBeforeStatus())) { @@ -385,9 +381,9 @@ class ConcernAdapter extends BaseRecyclerAdapter { if (libaoStatusEntity.getId().equals(concernEntity.getId())) { if ("finish".equals(libaoStatusEntity.getStatus())) { - viewHolder.read.setText(R.string.libao_finish); + viewHolder.mLibaoHint.setText(R.string.libao_finish); } else { - viewHolder.read.setText("点击查看"); + viewHolder.mLibaoHint.setText("点击查看"); } MeEntity userData = concernEntity.getMe(); if (userData != null && userData.getUserDataLibaoList() != null && userData.getUserDataLibaoList().size() > 0) { @@ -396,10 +392,10 @@ class ConcernAdapter extends BaseRecyclerAdapter { libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus()); if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断 libaoStatusEntity.setStatus("linged"); - viewHolder.read.setText(R.string.libao_linged); + viewHolder.mLibaoHint.setText(R.string.libao_linged); } else { libaoStatusEntity.setStatus("taoed"); - viewHolder.read.setText(R.string.libao_taoed); + viewHolder.mLibaoHint.setText(R.string.libao_taoed); } libaoStatusEntity.setCode(userDataLibaoEntity.getCode()); } @@ -408,12 +404,13 @@ class ConcernAdapter extends BaseRecyclerAdapter { return; } - viewHolder.line1.setVisibility(View.VISIBLE); - viewHolder.line2.setVisibility(View.VISIBLE); - viewHolder.comment.setVisibility(View.VISIBLE); - viewHolder.share.setVisibility(View.VISIBLE); - viewHolder.libaoIcon.setVisibility(View.GONE); + viewHolder.countContainer.setVisibility(View.VISIBLE); + if (concernEntity.getLink() != null) { + viewHolder.iconHint.setImageResource(R.drawable.ic_link); + } else { + viewHolder.iconHint.setImageResource(R.drawable.concern_message_icon); + } if (concernEntity.getBrief() != null) { viewHolder.content.setText(Html.fromHtml(concernEntity.getBrief())); viewHolder.content.setMaxLines(100); @@ -433,24 +430,17 @@ class ConcernAdapter extends BaseRecyclerAdapter { } int views = concernEntity.getViews(); - if (views == 0) { - viewHolder.read.setVisibility(View.INVISIBLE); - } else { - viewHolder.read.setVisibility(View.VISIBLE); - viewHolder.read.setText(String.format(Locale.getDefault(), "阅读 %d", views)); - } + viewHolder.readIcon.setVisibility(View.VISIBLE); + viewHolder.readNum.setText(String.valueOf(views)); int commentnum = concernEntity.getCommentnum(); - if (commentnum == 0) { - viewHolder.commentnum.setVisibility(View.GONE); + viewHolder.commentnum.setVisibility(View.VISIBLE); + if (commentnum > 999) { + viewHolder.commentnum.setText(R.string.thousand); } else { - viewHolder.commentnum.setVisibility(View.VISIBLE); - if (commentnum > 999) { - viewHolder.commentnum.setText(R.string.thousand); - } else { - viewHolder.commentnum.setText(String.valueOf(commentnum)); - } + viewHolder.commentnum.setText(String.valueOf(commentnum)); } + } private void initFooterViewHolder(FooterViewHolder viewHolder) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt index 304c931cee..76cd71de81 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt @@ -4,10 +4,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.support.v4.app.Fragment -import android.view.View -import android.view.ViewGroup -import android.widget.EditText -import android.widget.LinearLayout +import android.view.MenuItem import com.gh.base.BaseActivity import com.gh.base.OnViewClickListener import com.gh.base.adapter.FragmentAdapter @@ -21,16 +18,14 @@ import com.gh.gamecenter.qa.column.detail.recommends.RecommendsFragment import com.gh.gamecenter.qa.column.detail.unanswered.UnansweredFragment import com.gh.gamecenter.qa.entity.AskTagGroupsEntity import com.gh.gamecenter.qa.search.AskSearchActivity -import kotterknife.bindView import java.util.* class AskColumnDetailActivity : BaseActivity() { var mBinding: ActivityAskColumnDetailBinding? = null - private val mBarQuestionBtn by bindView(R.id.bar_question_btn) - private val mBarSearchEdit by bindView(R.id.bar_search_edit) - private val mBarBack by bindView(R.id.bar_back) + var mColumnEntity: AskTagGroupsEntity? = null + var mQuestionTag: String? = null override fun getLayoutId(): Int { return R.layout.activity_ask_column_detail @@ -38,28 +33,18 @@ class AskColumnDetailActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - val columnEntity = intent.getParcelableExtra(EntranceUtils.KEY_ASK_COLUMN_TAG) - val questionTag = intent.getStringExtra(EntranceUtils.KEY_ASK_TAG) -// if (!questionTag.isNullOrEmpty()) setNavigationTitle(questionTag) + setToolbarMenu(R.menu.menu_search) + val menuItem = getMenuItem(R.id.menu_search) + menuItem?.setIcon(R.drawable.ic_column_search) - // init SearchBar - mBarBack.setOnClickListener { finish() } - mBarQuestionBtn.visibility = View.INVISIBLE - mBarQuestionBtn.layoutParams = LinearLayout.LayoutParams(DisplayUtils.dip2px(20F), ViewGroup.LayoutParams.MATCH_PARENT) - mBarSearchEdit.hint = "专栏内搜索" - mBarSearchEdit.isFocusable = false - mBarSearchEdit.setOnClickListener({ - if (!questionTag.isNullOrEmpty()) { - startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, questionTag)) - } else { - startActivity(AskSearchActivity.getColumnSearchIntent(this, columnEntity.id)) - } - }) + mColumnEntity = intent.getParcelableExtra(EntranceUtils.KEY_ASK_COLUMN_TAG) + mQuestionTag = intent.getStringExtra(EntranceUtils.KEY_ASK_TAG) + if (!mQuestionTag.isNullOrEmpty()) setNavigationTitle(mQuestionTag) mBinding = ActivityAskColumnDetailBinding.bind(mContentView) mBinding?.columnDetailDes?.setExpendText("...更多") mBinding?.columnDetailTabRecommends?.isChecked = true - mBinding?.entity = columnEntity + mBinding?.entity = mColumnEntity mBinding?.clickListener = OnViewClickListener { v, position -> when (v.id) { R.id.column_detail_tab_recommends -> { @@ -83,12 +68,12 @@ class AskColumnDetailActivity : BaseActivity() { mBinding?.columnDetailViewpager?.currentItem = position as Int } -// mBinding?.columnDetailAppbar?.addOnOffsetChangedListener({ _, verticalOffset -> -// if (questionTag.isNullOrEmpty()) { -// if (Math.abs(verticalOffset) > DisplayUtils.dip2px(42F)) setNavigationTitle(columnEntity.name) -// else setNavigationTitle("") -// } -// }) + mBinding?.columnDetailAppbar?.addOnOffsetChangedListener({ _, verticalOffset -> + if (mQuestionTag.isNullOrEmpty()) { + if (Math.abs(verticalOffset) > DisplayUtils.dip2px(35F)) setNavigationTitle(mColumnEntity?.name) + else setNavigationTitle("") + } + }) // set fragment val fragmentList = ArrayList() @@ -98,8 +83,8 @@ class AskColumnDetailActivity : BaseActivity() { // add fragment argument val argument = Bundle() - argument.putParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG, columnEntity) - argument.putString(EntranceUtils.KEY_ASK_TAG, questionTag) + argument.putParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG, mColumnEntity) + argument.putString(EntranceUtils.KEY_ASK_TAG, mQuestionTag) argument.putParcelable(EntranceUtils.KEY_COMMUNITY_DATA, intent.getParcelableExtra(EntranceUtils.KEY_COMMUNITY_DATA)) for (fragment in fragmentList) fragment.arguments = argument @@ -111,6 +96,17 @@ class AskColumnDetailActivity : BaseActivity() { } } + override fun onMenuItemClick(item: MenuItem?): Boolean { + if (item?.itemId == R.id.menu_search) { + if (!mQuestionTag.isNullOrEmpty()) { + startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, mQuestionTag)) + } else { + startActivity(AskSearchActivity.getColumnSearchIntent(this, mColumnEntity?.id)) + } + } + return super.onMenuItemClick(item) + } + companion object { fun getIntentByColumn(context: Context, entity: AskTagGroupsEntity, community: CommunityEntity): Intent { diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java index 487c65c7b4..e19afc44a7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java @@ -45,13 +45,15 @@ public class AskSearchActivity extends BaseActivity { @BindView(R.id.ask_search_shadow) View mSearchShadow; @BindView(R.id.bar_question_btn) - View questionBtn; + TextView questionBtn; private AskSearchFragment mAskAskSearchFragment; private String mSearchKey; private String mPostedKey; + private String mColumnId; + private String mQuestionTag; public static Intent getIntent(Context context) { return new Intent(context, AskSearchActivity.class); @@ -97,17 +99,17 @@ public class AskSearchActivity extends BaseActivity { super.onCreate(savedInstanceState); mAskAskSearchFragment = new AskSearchFragment(); Bundle args = new Bundle(); - String columnId = getIntent().getStringExtra(EntranceUtils.KEY_COLUMN_ID); - String questionTag = getIntent().getStringExtra(EntranceUtils.KEY_QUESTION_TAG); - args.putString(EntranceUtils.KEY_COLUMN_ID, columnId); - args.putString(EntranceUtils.KEY_QUESTION_TAG, questionTag); + mColumnId = getIntent().getStringExtra(EntranceUtils.KEY_COLUMN_ID); + mQuestionTag = getIntent().getStringExtra(EntranceUtils.KEY_QUESTION_TAG); + args.putString(EntranceUtils.KEY_COLUMN_ID, mColumnId); + args.putString(EntranceUtils.KEY_QUESTION_TAG, mQuestionTag); mAskAskSearchFragment.setArguments(args); getSupportFragmentManager().beginTransaction().replace( R.id.layout_fragment_content, mAskAskSearchFragment).commitAllowingStateLoss(); - if (!TextUtils.isEmpty(columnId) || !TextUtils.isEmpty(questionTag)) { - questionBtn.setVisibility(View.INVISIBLE); - questionBtn.getLayoutParams().width = DisplayUtils.dip2px(20); + if (!TextUtils.isEmpty(mColumnId) || !TextUtils.isEmpty(mQuestionTag)) { + questionBtn.setText("搜索"); + mSearchEt.setHint("标签内搜索"); } mSearchEt.setOnEditorActionListener(new TextView.OnEditorActionListener() { @@ -115,7 +117,7 @@ public class AskSearchActivity extends BaseActivity { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { Util_System_Keyboard.hideSoftKeyboard(AskSearchActivity.this); - search(); + mBaseHandler.sendEmptyMessageDelayed(1, 300); } return false; } @@ -153,16 +155,26 @@ public class AskSearchActivity extends BaseActivity { if (v.getId() == R.id.bar_search_delete) { mSearchCancel.setVisibility(View.GONE); mSearchEt.setText(""); - } else if (v.getId() == R.id.search_questions_skip || v.getId() == R.id.bar_question_btn) { + } else if (v.getId() == R.id.search_questions_skip) { CheckLoginUtils.checkLogin(this, () -> { startActivityForResult(QuestionEditActivity.Companion.getIntent(this, mSearchKey), QUESTION_REQUEST_CODE); }); + } else if (v.getId() == R.id.bar_question_btn) { + if (!TextUtils.isEmpty(mColumnId) || !TextUtils.isEmpty(mQuestionTag)) { + mBaseHandler.sendEmptyMessageDelayed(1, 300); + } else { + CheckLoginUtils.checkLogin(this, () -> { + startActivityForResult(QuestionEditActivity.Companion.getIntent(this, mSearchKey), QUESTION_REQUEST_CODE); + }); + } } else if (v.getId() == R.id.bar_back) { finish(); } } private void search() { + if (mSearchKey == null) return; + if (mAskAskSearchFragment != null) { mAskAskSearchFragment.search(mSearchKey); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt index 86a09a2af5..09a49e51eb 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt @@ -24,7 +24,7 @@ class OpenedFragment : ListFragment() { } override fun getItemDecoration(): RecyclerView.ItemDecoration { - return GridDivider(context, 2, 2, ContextCompat.getColor(context!!, R.color.cutting_line)) + return GridDivider(context, 2, 2, ContextCompat.getColor(context!!, R.color.cutting_line), true) } override fun provideListAdapter(): OpenedAdapter { diff --git a/app/src/main/res/drawable-hdpi/kc_checkbox_select.png b/app/src/main/res/drawable-hdpi/kc_checkbox_select.png index 6fcfd71c55..79caeb825b 100644 Binary files a/app/src/main/res/drawable-hdpi/kc_checkbox_select.png and b/app/src/main/res/drawable-hdpi/kc_checkbox_select.png differ diff --git a/app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png b/app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png index 32e3809ed2..747ec14774 100644 Binary files a/app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png and b/app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png differ diff --git a/app/src/main/res/drawable-nodpi/splash_01.webp b/app/src/main/res/drawable-nodpi/splash_01.webp index c83cadd736..63d3b733fa 100644 Binary files a/app/src/main/res/drawable-nodpi/splash_01.webp and b/app/src/main/res/drawable-nodpi/splash_01.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_column_search.png b/app/src/main/res/drawable-xhdpi/ic_column_search.png new file mode 100644 index 0000000000..124733b012 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_column_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_read.png b/app/src/main/res/drawable-xhdpi/ic_read.png new file mode 100644 index 0000000000..280ca2c531 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_read.png differ diff --git a/app/src/main/res/drawable-xhdpi/menu_more_report.png b/app/src/main/res/drawable-xhdpi/menu_more_report.png index 1c6d103769..ea2bf2e63c 100644 Binary files a/app/src/main/res/drawable-xhdpi/menu_more_report.png and b/app/src/main/res/drawable-xhdpi/menu_more_report.png differ diff --git a/app/src/main/res/drawable-xxhdpi/personal_home_icon.png b/app/src/main/res/drawable-xxhdpi/personal_home_icon.png index 5dfd5c593c..c0a18cd4d8 100644 Binary files a/app/src/main/res/drawable-xxhdpi/personal_home_icon.png and b/app/src/main/res/drawable-xxhdpi/personal_home_icon.png differ diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml index 0240109cfa..308364d04d 100644 --- a/app/src/main/res/layout/activity_ask_column_detail.xml +++ b/app/src/main/res/layout/activity_ask_column_detail.xml @@ -18,7 +18,7 @@ android:layout_height = "match_parent" android:orientation = "vertical" > - + - - - - @@ -188,8 +187,8 @@ android:gravity = "center" android:maxLines = "2" android:text = "@{entity.note}" - android:textColor = "@color/title" - android:textColorHint = "@color/title" + android:textColor = "@color/hint" + android:textColorHint = "@color/hint" android:textSize = "12sp" /> diff --git a/app/src/main/res/layout/answer_comment_item.xml b/app/src/main/res/layout/answer_comment_item.xml index ec9d46483b..6f93f4964b 100644 --- a/app/src/main/res/layout/answer_comment_item.xml +++ b/app/src/main/res/layout/answer_comment_item.xml @@ -42,8 +42,8 @@ diff --git a/app/src/main/res/layout/ask_answer_item.xml b/app/src/main/res/layout/ask_answer_item.xml index 319771f015..92ab09d907 100644 --- a/app/src/main/res/layout/ask_answer_item.xml +++ b/app/src/main/res/layout/ask_answer_item.xml @@ -28,8 +28,8 @@ diff --git a/app/src/main/res/layout/ask_questions_hot_item.xml b/app/src/main/res/layout/ask_questions_hot_item.xml index 936804eddd..4222196738 100644 --- a/app/src/main/res/layout/ask_questions_hot_item.xml +++ b/app/src/main/res/layout/ask_questions_hot_item.xml @@ -35,8 +35,8 @@ diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index cb53fbd27c..4c00163861 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -38,8 +38,8 @@ diff --git a/app/src/main/res/layout/followers_or_fans_item.xml b/app/src/main/res/layout/followers_or_fans_item.xml index 7809751dc5..ef12b52a0c 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -35,8 +35,8 @@ diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 35f0015739..be85070659 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -140,8 +140,8 @@ diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 14bba9f31e..dca64afc12 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -34,8 +34,8 @@ diff --git a/app/src/main/res/layout/message_kefu_item.xml b/app/src/main/res/layout/message_kefu_item.xml index 122ca95d69..628e469899 100644 --- a/app/src/main/res/layout/message_kefu_item.xml +++ b/app/src/main/res/layout/message_kefu_item.xml @@ -29,8 +29,8 @@ diff --git a/app/src/main/res/layout/news_digest_item.xml b/app/src/main/res/layout/news_digest_item.xml index 1e13e60cfe..aa1af02d21 100644 --- a/app/src/main/res/layout/news_digest_item.xml +++ b/app/src/main/res/layout/news_digest_item.xml @@ -49,12 +49,10 @@ + android:layout_alignParentRight = "true" /> @@ -79,7 +77,19 @@ android:paddingLeft = "20dp" android:paddingRight = "20dp" /> + + - + android:gravity = "center" > + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a79ed5fee3..3c4c448dbc 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,7 +9,7 @@ 45dp - 12dp - 12dp + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a0f923ae1..2b732e6021 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -568,7 +568,7 @@ 找不到图片管理器 个人主页 个性签名 - 介绍下自己吧.. + 介绍下自己吧 自己 游戏名字*]]>