From f9142b1326690b0c48f826aec3194b7d7e0e113b Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Sat, 1 Sep 2018 21:52:07 +0800 Subject: [PATCH] menu --- app/build.gradle | 2 + .../nutritionmaster/base/BaseActivity.java | 2 + .../nutritionmaster/modules/MainActivity.java | 66 +++++++++++ app/src/main/res/drawable/ic_exchange.xml | 4 + app/src/main/res/drawable/ic_record.xml | 7 ++ app/src/main/res/drawable/ic_search.xml | 4 + app/src/main/res/layout/activity_main.xml | 108 +++++++++++++----- .../res/layout/body_information_fragment.xml | 8 +- app/src/main/res/menu/menu_main.xml | 26 +++++ app/src/main/res/values/arrays.xml | 2 +- app/src/main/res/values/dimens.xml | 3 + 11 files changed, 197 insertions(+), 35 deletions(-) create mode 100644 app/src/main/res/drawable/ic_exchange.xml create mode 100644 app/src/main/res/drawable/ic_record.xml create mode 100644 app/src/main/res/drawable/ic_search.xml create mode 100644 app/src/main/res/menu/menu_main.xml diff --git a/app/build.gradle b/app/build.gradle index f98f133..ffbe81c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,4 +59,6 @@ dependencies { implementation 'me.panpf:spider-web-score-view:1.0.1' //折线 implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' + //searchview + compile 'com.miguelcatalan:materialsearchview:1.4.0' } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java index d9f9592..d1f44e1 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java @@ -23,6 +23,8 @@ public abstract class BaseActivity extends AppCompatActivity { initToolBar(); } + + /** * 设置布局layout * diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java index 3d7791d..f5a2d4e 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java @@ -1,8 +1,13 @@ package com.example.ninefourone.nutritionmaster.modules; import android.annotation.SuppressLint; +import android.os.Build; import android.os.Bundle; +import android.support.annotation.RequiresApi; +import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; @@ -14,10 +19,13 @@ import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter; import com.example.ninefourone.nutritionmaster.base.BaseActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; +import com.example.ninefourone.nutritionmaster.utils.MessageUtils; import com.flyco.tablayout.SlidingTabLayout; import com.github.siyamed.shapeimageview.CircularImageView; +import com.miguelcatalan.materialsearchview.MaterialSearchView; import com.mxn.soul.flowingdrawer_core.ElasticDrawer; import com.mxn.soul.flowingdrawer_core.FlowingDrawer; +import com.orhanobut.logger.Logger; import butterknife.BindView; import butterknife.ButterKnife; @@ -47,6 +55,12 @@ public class MainActivity extends BaseActivity { SpiderWebScoreView spiderWebMainActivity; @BindView(R.id.layout_mainActivity_circular) CircularLayout layoutMainActivityCircular; + // @BindView(R.id.search_button) +// ImageView searchButton; + @BindView(R.id.search_view) + MaterialSearchView searchView; + @BindView(R.id.tool_bar) + Toolbar toolBar; @Override @@ -75,6 +89,7 @@ public class MainActivity extends BaseActivity { }); initSpiderView(); initViewPager(); + initSearchView(); } /** @@ -102,13 +117,33 @@ public class MainActivity extends BaseActivity { } + @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); // TODO: add setContentView(...) invocation ButterKnife.bind(this); + Logger.d("oncreate"); + setSupportActionBar(toolBar); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + Logger.d("oncreateMenu"); + getMenuInflater().inflate(R.menu.menu_main, menu); + MenuItem item = menu.findItem(R.id.id_action_search); + searchView.setMenuItem(item); + return true; + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + Logger.d("prepareMenu"); + return super.onPrepareOptionsMenu(menu); + } + + /** * 点击事件 */ @@ -134,5 +169,36 @@ public class MainActivity extends BaseActivity { } } + /** + * 初始化SearchView + */ + private void initSearchView() { + searchView.setOnQueryTextListener(new MaterialSearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String query) { + MessageUtils.MakeToast(query); + return false; + } + + @Override + public boolean onQueryTextChange(String newText) { +// MessageUtils.MakeToast(newText); + return false; + } + }); + + searchView.setOnSearchViewListener(new MaterialSearchView.SearchViewListener() { + @Override + public void onSearchViewShown() { +// MessageUtils.MakeToast("Shown"); + } + + @Override + public void onSearchViewClosed() { +// MessageUtils.MakeToast("closed"); + } + }); + + } } diff --git a/app/src/main/res/drawable/ic_exchange.xml b/app/src/main/res/drawable/ic_exchange.xml new file mode 100644 index 0000000..2b6e6b5 --- /dev/null +++ b/app/src/main/res/drawable/ic_exchange.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_record.xml b/app/src/main/res/drawable/ic_record.xml new file mode 100644 index 0000000..d808cb1 --- /dev/null +++ b/app/src/main/res/drawable/ic_record.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 0000000..6f3f8b5 --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4769883..cab1203 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -44,44 +44,89 @@ android:orientation="vertical"> - - - - + + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="horizontal"> - - + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_drawer_home" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,6 +154,11 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + @@ -249,7 +299,7 @@ android:layout_height="100dp" android:layout_gravity="center" app:scoreColor="@color/colorPrimary" - app:scoreStrokeColor="@color/colorPrimary"/> + app:scoreStrokeColor="@color/colorPrimary" /> - - diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml index 7709896..359be6d 100644 --- a/app/src/main/res/layout/body_information_fragment.xml +++ b/app/src/main/res/layout/body_information_fragment.xml @@ -104,8 +104,8 @@ @@ -313,7 +313,7 @@ diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml new file mode 100644 index 0000000..c5bb617 --- /dev/null +++ b/app/src/main/res/menu/menu_main.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 3741717..9d22395 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -2,7 +2,7 @@ page1 - page2 + 今日信息 page3 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d788fe3..e9c8804 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -18,4 +18,7 @@ 200dp + 20dp + +