From 965d756cba33fb4e2e9bb0d1e0a9c591fc84a149 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 23 Apr 2018 16:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.2=20RELE?= =?UTF-8?q?ASE=EF=BC=8820180419-1810=EF=BC=89UI=E9=97=AE=E9=A2=98=E6=B1=87?= =?UTF-8?q?=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/EntranceUtils.java | 1 + .../com/gh/gamecenter/NewsDetailActivity.java | 3 +- .../gamecenter/QuestionsDetailActivity.java | 8 +++ .../gamecenter/adapter/ToolBoxRvAdapter.java | 65 ++++++++--------- .../viewholder/GameHeadViewHolder.java | 4 -- .../ask/AskQuestionsRecommendsFragment.java | 9 +++ .../ask/AskQuestionsRecommendsViewModel.java | 2 +- .../gamecenter/ask/AskSubjectPageAdapter.java | 3 + .../ask/myask/ConcernQuestionsFragment.java | 15 +++- .../QuestionsDetailFragment.java | 67 +++++++++++++----- .../fragment/MainWrapperFragment.java | 44 ++++++++++++ .../fragment/game/GameFragmentAdapter.java | 1 - .../communities_select_hint.png | Bin 0 -> 14887 bytes .../layout/dialog_communities_select_hint.xml | 18 +++++ .../res/layout/fragment_answer_detail.xml | 2 +- app/src/main/res/layout/fragment_ask.xml | 5 +- app/src/main/res/layout/fragment_personal.xml | 4 +- app/src/main/res/layout/game_head_item.xml | 15 ++-- app/src/main/res/layout/layout_menu_inset.xml | 2 +- .../main/res/layout/questionsdetail_item.xml | 10 +-- app/src/main/res/layout/toolbox_hint_item.xml | 11 +++ app/src/main/res/menu/menu_answer.xml | 6 ++ 22 files changed, 212 insertions(+), 83 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/communities_select_hint.png create mode 100644 app/src/main/res/layout/dialog_communities_select_hint.xml create mode 100644 app/src/main/res/layout/toolbox_hint_item.xml diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java index ae5bc4a13b..2609014c1f 100644 --- a/app/src/main/java/com/gh/common/util/EntranceUtils.java +++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java @@ -71,6 +71,7 @@ public class EntranceUtils { public static final String KEY_QUESTIONS_SEARCH_KEY = "questionsSearchKey"; public static final String KEY_SHOW_ANSWER_COMMENT = "showAnswerComment"; public static final String KEY_VERSION_UPDATE = "versionUpdate"; + public static final String KEY_CHECK_QUESTION_CONCERN = "check_question_concern"; public static void jumpActivity(Context context, Bundle bundle) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index bf6a1cf2fb..4a4b22b15b 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -252,6 +252,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mNewsShare.getLayoutParams(); params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params.addRule(RelativeLayout.CENTER_VERTICAL); + params.setMargins(0,0,DisplayUtils.dip2px(this, 4),0); reuse_actionbar.addView(mNewsShare, params); mNewsCollection = (ImageView) LayoutInflater.from(this).inflate(R.layout.menu_action_collection, reuse_actionbar, false); @@ -259,7 +260,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mNewsCollection.getLayoutParams(); params2.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); params2.addRule(RelativeLayout.CENTER_VERTICAL); - params2.setMargins(0, 0, params.width - DisplayUtils.dip2px(this, 5), 0); + params2.setMargins(0, 0, params.width - DisplayUtils.dip2px(this, 7), 0); reuse_actionbar.addView(mNewsCollection, params2); mDetailRv.setHasFixedSize(true); diff --git a/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java index 8062c2ec9e..78dfb0456d 100644 --- a/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/QuestionsDetailActivity.java @@ -21,4 +21,12 @@ public class QuestionsDetailActivity extends NormalActivity { bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); return getTargetIntent(context, QuestionsDetailActivity.class, QuestionsDetailFragment.class, bundle); } + + public static Intent getIntent(Context context, String questionId, String entrance, boolean isCheckConcern) { + Bundle bundle = new Bundle(); + bundle.putString(EntranceUtils.KEY_QUESTIONS_ID, questionId); + bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance); + bundle.putBoolean(EntranceUtils.KEY_CHECK_QUESTION_CONCERN, isCheckConcern); + return getTargetIntent(context, QuestionsDetailActivity.class, QuestionsDetailFragment.class, bundle); + } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 9245f55c84..f9a469d4f3 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -18,6 +18,7 @@ import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; +import com.gh.gamecenter.adapter.viewholder.ReuseViewHolder; import com.gh.gamecenter.adapter.viewholder.SearchViewHolder; import com.gh.gamecenter.adapter.viewholder.ToolBoxViewHolder; import com.gh.gamecenter.entity.ToolBoxEntity; @@ -143,10 +144,12 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { public int getItemViewType(int position) { if (position == 0) { return 0; - } else if (position == 1 || position == getItemCount() - 1) { + } else if (position == 1) { return 1; - } else { + } else if (position == getItemCount() - 1) { return 2; + } else { + return 3; } } @@ -155,9 +158,12 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { if (viewType == 0) { View view = mLayoutInflater.inflate(R.layout.layout_search_bar, parent, false); return new SearchViewHolder(view); - } else if (viewType == 1) { + } else if (viewType == 2) { View view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false); return new FooterViewHolder(view); + } else if (viewType == 1) { + View view = mLayoutInflater.inflate(R.layout.toolbox_hint_item, parent, false); + return new ReuseViewHolder(view); } else { View view = mLayoutInflater.inflate(R.layout.toolbox_item, parent, false); return new ToolBoxViewHolder(view); @@ -173,10 +179,12 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { initToolBoxViewHolder(viewHolder, toolBoxEntity); } else if (holder instanceof FooterViewHolder) { FooterViewHolder viewHolder = (FooterViewHolder) holder; - initFooterViewHolder(viewHolder, position); + initFooterViewHolder(viewHolder); } else if (holder instanceof SearchViewHolder) { SearchViewHolder viewHolder = (SearchViewHolder) holder; initSearchViewHolder(viewHolder); + } else if (holder instanceof ReuseViewHolder) { + holder.itemView.setOnClickListener(v -> SuggestionActivity.startSuggestionActivity(mContext, 2, null, null)); } } @@ -244,47 +252,32 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { } - private void initFooterViewHolder(FooterViewHolder viewHolder, int position) { + private void initFooterViewHolder(FooterViewHolder viewHolder) { viewHolder.initItemPadding(); - - if (position == 1) { - viewHolder.lineLeft.setVisibility(View.VISIBLE); - viewHolder.lineRight.setVisibility(View.VISIBLE); + if (mIsNetworkError) { + viewHolder.lineLeft.setVisibility(View.GONE); + viewHolder.lineRight.setVisibility(View.GONE); viewHolder.loading.setVisibility(View.GONE); - viewHolder.hint.setText(R.string.tools_suggestion_hint); + viewHolder.hint.setText(R.string.loading_failed_retry); viewHolder.itemView.setClickable(true); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SuggestionActivity.startSuggestionActivity(mContext, 2, null, null); + loadData(); } }); + } else if (mIsOver) { + viewHolder.lineLeft.setVisibility(View.VISIBLE); + viewHolder.lineRight.setVisibility(View.VISIBLE); + viewHolder.loading.setVisibility(View.GONE); + viewHolder.hint.setText(R.string.loading_complete); + viewHolder.itemView.setClickable(false); } else { - if (mIsNetworkError) { - viewHolder.lineLeft.setVisibility(View.GONE); - viewHolder.lineRight.setVisibility(View.GONE); - viewHolder.loading.setVisibility(View.GONE); - viewHolder.hint.setText(R.string.loading_failed_retry); - viewHolder.itemView.setClickable(true); - viewHolder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - loadData(); - } - }); - } else if (mIsOver) { - viewHolder.lineLeft.setVisibility(View.VISIBLE); - viewHolder.lineRight.setVisibility(View.VISIBLE); - viewHolder.loading.setVisibility(View.GONE); - viewHolder.hint.setText(R.string.loading_complete); - viewHolder.itemView.setClickable(false); - } else { - viewHolder.lineLeft.setVisibility(View.GONE); - viewHolder.lineRight.setVisibility(View.GONE); - viewHolder.loading.setVisibility(View.VISIBLE); - viewHolder.hint.setText(loading); - viewHolder.itemView.setClickable(false); - } + viewHolder.lineLeft.setVisibility(View.GONE); + viewHolder.lineRight.setVisibility(View.GONE); + viewHolder.loading.setVisibility(View.VISIBLE); + viewHolder.hint.setText(loading); + viewHolder.itemView.setClickable(false); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java index b7af523ac0..66c503920c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.adapter.viewholder; import android.view.View; -import android.widget.ImageView; import android.widget.ProgressBar; import android.widget.TextView; @@ -15,9 +14,6 @@ import butterknife.BindView; */ public class GameHeadViewHolder extends BaseRecyclerViewHolder { - @BindView(R.id.head_thumb) - public ImageView thumb; - @BindView(R.id.head_title) public TextView title; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java index 3775fbb007..b1eb1599ea 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java @@ -73,9 +73,16 @@ public class AskQuestionsRecommendsFragment extends ListFragment { mAdapter.setSubjectEntity(entityList); }); + mBaseHandler.sendEmptyMessageDelayed(2, 1500); } @Override @@ -217,6 +225,7 @@ public class AskQuestionsRecommendsFragment extends ListFragment { + DataUtils.onMtaEvent(mContext, "问答专题", UserManager.getInstance().getCommunityName(mContext), entity.getTitle()); if ("answer_list".equals(entity.getType())) { mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity)); } else { diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java index 962bebc763..ce4b293665 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsFragment.java @@ -1,5 +1,7 @@ package com.gh.gamecenter.ask.myask; +import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.view.View; @@ -24,9 +26,18 @@ import rx.Observable; */ public class ConcernQuestionsFragment extends ListFragment { + public static final int KEY_CHECK_QUESTION_CONCERN = 105; private ConcernQuestionsAdapter mAdapter; + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == KEY_CHECK_QUESTION_CONCERN && resultCode == Activity.RESULT_OK) { + onLoadRefresh(); + } + } + public static ConcernQuestionsFragment getInstance(String entrance) { ConcernQuestionsFragment fragment = new ConcernQuestionsFragment(); Bundle args = new Bundle(); @@ -57,8 +68,8 @@ public class ConcernQuestionsFragment extends ListFragment 0) { - mQuestionsDetailEntity.setFollowCount(mQuestionsDetailEntity.getFollowCount() - 1); - } - mQuestionsDetailEntity.getMe().setQuestionFollowed(false); - mAdapter.notifyItemChanged(0); - toast("取消关注"); - } - - @Override - public void onError() { - - } - }); + cancelConcern(); } }); break; @@ -381,6 +372,7 @@ public class QuestionsDetailFragment extends ListFragment 0) { + mQuestionsDetailEntity.setFollowCount(mQuestionsDetailEntity.getFollowCount() - 1); + } + mQuestionsDetailEntity.getMe().setQuestionFollowed(false); + mAdapter.notifyItemChanged(0); + toast("取消关注"); + } + } + + @Override + public void onError() { + + } + }); + } + + private void showCancelConcernDialog() { + DialogUtils.showAlertDialog(getContext() + , "取消关注问题", "问题已被删除，一键取消关注问题" + , " 取消关注", "暂不 " + , () -> { + cancelConcern(); + } + , () -> { + if (getActivity() != null) getActivity().finish(); + }); + } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 4a39968497..1add2df2b5 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -1,13 +1,20 @@ package com.gh.gamecenter.fragment; +import android.app.Dialog; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; +import android.view.Window; import com.gh.base.fragment.BaseFragment_ViewPager_Checkable; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.DataUtils; +import com.gh.gamecenter.CommunitiesSelectActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.ask.AskFragment; import com.gh.gamecenter.db.GameTrendsDao; @@ -35,6 +42,7 @@ import rx.schedulers.Schedulers; import static com.gh.gamecenter.MainActivity.EB_MAINACTIVITY_TAG; import static com.gh.gamecenter.MainActivity.EB_SKIP_GAMEFRAGMENT; +import static com.gh.gamecenter.ask.AskFragment.COMMUNITIES_SELECT_REQUEST; /** * @author CsHeng @@ -59,6 +67,10 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable { private GameTrendsDao mGameTrendsDao; + private SharedPreferences sp; + + private boolean mIsShowSelectCommunitiesDialog; + private long mLastRequestDiscoveryTime; @Override @@ -88,6 +100,14 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mGameTrendsDao = new GameTrendsDao(getContext()); + sp = PreferenceManager.getDefaultSharedPreferences(getContext()); + mIsShowSelectCommunitiesDialog = sp.getBoolean("isShowSelectCommunitiesDialog", true); + if (mIsShowSelectCommunitiesDialog) { + final Bundle args = getArguments(); + if (args != null && args.getInt(ARGS_INDEX) == INDEX_ASK) { + mIsShowSelectCommunitiesDialog = false; + } + } } @Override @@ -114,6 +134,12 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable { @Override protected void onPageChanged(int index) { super.onPageChanged(index); + if (index == INDEX_ASK && mIsShowSelectCommunitiesDialog) { + sp.edit().putBoolean("isShowSelectCommunitiesDialog", false).apply(); + mIsShowSelectCommunitiesDialog = false; + showDialog(); + } + switch (index) { case INDEX_GAME: @@ -206,4 +232,22 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable { getDiscoveryData(true); } } + + public void showDialog() { + Dialog dialog = new Dialog(getContext(), R.style.DialogWindowTransparent); + dialog.setCancelable(false); + Window window = dialog.getWindow(); + if (window != null) { + window.setGravity(Gravity.LEFT | Gravity.TOP); + } + dialog.show(); + LayoutInflater inflater = LayoutInflater.from(getContext()); + View viewDialog = inflater.inflate(R.layout.dialog_communities_select_hint, null); + View view = viewDialog.findViewById(R.id.communities_select_hint); + view.setOnClickListener(v -> { + dialog.dismiss(); + startActivityForResult(CommunitiesSelectActivity.getIntent(getContext()), COMMUNITIES_SELECT_REQUEST); + }); + dialog.setContentView(viewDialog); + } } diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java index fbbdf5359e..7fde9a3aaf 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java @@ -923,7 +923,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { String image = mSubjectList.get(i).getData().get(0).getImage(); if (position == offset && TextUtils.isEmpty(gameEntity.getImage()) || position == offset + 1 && !TextUtils.isEmpty(image)) { - holder.thumb.setVisibility(View.GONE); holder.line.setVisibility(View.VISIBLE); holder.title.setText(mSubjectList.get(i).getName()); holder.title.setTextColor(Color.BLACK); diff --git a/app/src/main/res/drawable-xhdpi/communities_select_hint.png b/app/src/main/res/drawable-xhdpi/communities_select_hint.png new file mode 100644 index 0000000000000000000000000000000000000000..71fa9ab0fb656b3ee9b65db3117e603f71865ac8 GIT binary patch literal 14887 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/dialog_communities_select_hint.xml b/app/src/main/res/layout/dialog_communities_select_hint.xml new file mode 100644 index 0000000000..ae3aca0506 --- /dev/null +++ b/app/src/main/res/layout/dialog_communities_select_hint.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index b4ddc4a9c0..62e1ab880a 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -161,7 +161,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="20dp" - android:layout_marginTop="10dp" + android:layout_marginTop="33dp" android:textColor="@color/title" android:textSize="12sp" android:gravity="right" diff --git a/app/src/main/res/layout/fragment_ask.xml b/app/src/main/res/layout/fragment_ask.xml index ccdbb2a6ad..d9b72ed252 100644 --- a/app/src/main/res/layout/fragment_ask.xml +++ b/app/src/main/res/layout/fragment_ask.xml @@ -15,13 +15,16 @@ android:id = "@+id/ask_selectgame" android:layout_width = "@dimen/appbar_height" android:layout_height = "@dimen/appbar_height" + android:layout_marginLeft = "3dp" android:scaleType = "center" - android:src = "@drawable/ic_ask_selectgame" /> + android:src = "@drawable/ic_ask_selectgame" + app:layout_constraintLeft_toLeftOf = "parent" /> diff --git a/app/src/main/res/layout/fragment_personal.xml b/app/src/main/res/layout/fragment_personal.xml index 1b0c381df5..70ef49944b 100644 --- a/app/src/main/res/layout/fragment_personal.xml +++ b/app/src/main/res/layout/fragment_personal.xml @@ -26,7 +26,7 @@ android:layout_width = "70dp" android:layout_height = "70dp" android:layout_centerHorizontal = "true" - android:layout_marginTop = "42dp" + android:layout_marginTop = "40dp" fresco:placeholderImage = "@drawable/user_default_icon_comment" fresco:roundAsCircle = "true" /> @@ -56,7 +56,7 @@ android:layout_width = "match_parent" android:layout_height = "wrap_content" android:background = "@android:color/white" - android:paddingTop = "35dp" > + android:paddingTop = "25dp" > - - @@ -65,8 +60,8 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/layout_menu_inset.xml b/app/src/main/res/layout/layout_menu_inset.xml index fd3a596e4e..449f0d262f 100644 --- a/app/src/main/res/layout/layout_menu_inset.xml +++ b/app/src/main/res/layout/layout_menu_inset.xml @@ -1,4 +1,4 @@ \ 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 accf5c0854..05c60bee58 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -29,7 +29,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "20dp" android:layout_marginRight = "20dp" - android:layout_marginTop = "7dp" + android:layout_marginTop = "6dp" android:textColor = "@color/black" android:textSize = "16sp" android:textStyle = "bold" @@ -41,7 +41,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "20dp" android:layout_marginRight = "20dp" - android:layout_marginTop = "9dp" + android:layout_marginTop = "8dp" app:layout_constraintTop_toBottomOf = "@id/questionsdetail_item_title" > diff --git a/app/src/main/res/layout/toolbox_hint_item.xml b/app/src/main/res/layout/toolbox_hint_item.xml new file mode 100644 index 0000000000..30b1fea69c --- /dev/null +++ b/app/src/main/res/layout/toolbox_hint_item.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_answer.xml b/app/src/main/res/menu/menu_answer.xml index 5d5d6ba956..07742adf28 100644 --- a/app/src/main/res/menu/menu_answer.xml +++ b/app/src/main/res/menu/menu_answer.xml @@ -14,4 +14,10 @@ android:title = "更多" app:showAsAction = "always" /> + + + \ No newline at end of file