diff --git a/app/src/main/java/com/gh/base/BaseToolBarActivity.java b/app/src/main/java/com/gh/base/BaseToolBarActivity.java index 267276c538..040cf9a8a2 100644 --- a/app/src/main/java/com/gh/base/BaseToolBarActivity.java +++ b/app/src/main/java/com/gh/base/BaseToolBarActivity.java @@ -54,6 +54,7 @@ public abstract class BaseToolBarActivity extends BaseAppCompatActivity { } } + @Deprecated public void setNavigationTitle(String title) { // if (mTitleTv != null) { // mTitleTv.setText(title); diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java index 169d775b01..fcbfbe2ae1 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.ask.search; import android.content.Context; +import android.support.constraint.ConstraintLayout; import android.support.v7.widget.RecyclerView; import android.text.Html; import android.text.TextUtils; @@ -9,6 +10,7 @@ import android.view.ViewGroup; import com.gh.base.OnListClickListener; import com.gh.common.constant.ItemViewType; +import com.gh.common.util.DisplayUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.ask.entity.AskSearchEntity; @@ -102,6 +104,13 @@ public class AskSearchAdapter extends ListAdapter { askHolder.mAnswercount.setText(mContext.getString(R.string.ask_answer_count, questions.getAnswerCount())); askHolder.mTitle.setText(Html.fromHtml(questions.getTitle())); askHolder.mContent.setText(Html.fromHtml(searchEntity.getBrief())); + ConstraintLayout.LayoutParams params = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + if (position == 0) { + params.setMargins(0, DisplayUtils.dip2px(mContext, 8), 0, 0); + } else { + params.setMargins(0, 0, 0, 0); + } + askHolder.itemView.setLayoutParams(params); break; case ItemViewType.ITEM_FOOTER: FooterViewHolder footerViewHolder = (FooterViewHolder) holder; diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java index 6ecb3c65b0..82de2b40d4 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchFragment.java @@ -4,12 +4,14 @@ import android.os.Bundle; import android.os.Message; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import com.gh.common.util.AskLogUtils; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.EntranceUtils; +import com.gh.common.view.VerticalItemDecoration; import com.gh.gamecenter.AskQuestionsDetailActivity; import com.gh.gamecenter.NormalActivity; import com.gh.gamecenter.R; @@ -53,6 +55,11 @@ public class AskSearchFragment extends ListFragment { } } + @Override + protected RecyclerView.ItemDecoration getItemDecoration() { + return new VerticalItemDecoration(getContext(), 1, false); + } + @Override protected int getLayoutId() { return R.layout.fragment_ask_search; diff --git a/app/src/main/res/layout/ask_search_actionbar.xml b/app/src/main/res/layout/ask_search_actionbar.xml index d1e0e8667d..1d525e0641 100644 --- a/app/src/main/res/layout/ask_search_actionbar.xml +++ b/app/src/main/res/layout/ask_search_actionbar.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/fragment_ask.xml b/app/src/main/res/layout/fragment_ask.xml index 8785b846df..f44b519413 100644 --- a/app/src/main/res/layout/fragment_ask.xml +++ b/app/src/main/res/layout/fragment_ask.xml @@ -34,7 +34,7 @@ android:layout_marginBottom = "8dp" android:layout_marginTop = "8dp" android:gravity = "center" - android:textColor = "@color/title" + android:textColor = "@color/black" android:textSize = "15sp" android:textStyle = "bold" app:layout_constraintBottom_toBottomOf = "@id/ask_selectgame" diff --git a/app/src/main/res/layout/fragment_toolbar.xml b/app/src/main/res/layout/fragment_toolbar.xml index 6aa1d02e5b..b3270d1ad9 100644 --- a/app/src/main/res/layout/fragment_toolbar.xml +++ b/app/src/main/res/layout/fragment_toolbar.xml @@ -2,7 +2,7 @@ @@ -10,7 +10,7 @@ diff --git a/app/src/main/res/layout/fragment_wrapper_toolbar.xml b/app/src/main/res/layout/fragment_wrapper_toolbar.xml index 426052332d..9d061b2eff 100644 --- a/app/src/main/res/layout/fragment_wrapper_toolbar.xml +++ b/app/src/main/res/layout/fragment_wrapper_toolbar.xml @@ -7,7 +7,7 @@ + android:layout_height = "@dimen/appbar_height" /> + android:layout_height = "match_parent" /> @@ -10,8 +10,7 @@ android:id = "@+id/btnGoBack" android:layout_width = "0dp" android:layout_height = "match_parent" - android:layout_weight = "1" - android:padding = "6dp" > + android:layout_weight = "1" > @@ -42,7 +41,7 @@ android:singleLine = "true" android:textColorHint = "@color/text_b2b2b2" android:textCursorDrawable = "@drawable/cursor_color" - android:textSize = "16sp" /> + android:textSize = "14sp" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index fd2c4a1cda..d332bebed3 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,4 +5,6 @@ 25dp + 50dp + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e877e4bab2..f5c71a6b64 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -54,7 +54,7 @@