From e7a37e6bce707dfe68006340f66db9c2bc709d14 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Wed, 21 Aug 2019 16:40:43 +0800 Subject: [PATCH] drawer --- android/OldPeopleHome/app/build.gradle | 4 + .../children/activity/ChildMainActivity.java | 26 ++- .../main/res/layout/activity_child_main.xml | 154 +++++++++++------- .../res/layout/child_main_spinner_item.xml | 5 +- .../app/src/main/res/values/colors.xml | 2 + .../app/src/main/res/values/styles.xml | 6 + 6 files changed, 128 insertions(+), 69 deletions(-) diff --git a/android/OldPeopleHome/app/build.gradle b/android/OldPeopleHome/app/build.gradle index 54c4e0e..e42b9c2 100644 --- a/android/OldPeopleHome/app/build.gradle +++ b/android/OldPeopleHome/app/build.gradle @@ -52,4 +52,8 @@ dependencies { //spring implementation 'com.jaredrummler:material-spinner:1.3.1' + + //drawer + implementation 'com.mxn.soul:flowingdrawer-core:2.1.0' + implementation 'com.nineoldandroids:library:2.4.0' } diff --git a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java index 327f165..69b5146 100644 --- a/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java +++ b/android/OldPeopleHome/app/src/main/java/com/scorpiomiku/oldpeoplehome/modules/children/activity/ChildMainActivity.java @@ -7,16 +7,14 @@ import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; -import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import android.widget.ArrayAdapter; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.Spinner; -import android.widget.SpinnerAdapter; -import com.jaredrummler.materialspinner.MaterialSpinner; -import com.jaredrummler.materialspinner.MaterialSpinnerAdapter; +import com.mxn.soul.flowingdrawer_core.FlowingDrawer; +import com.mxn.soul.flowingdrawer_core.FlowingMenuLayout; import com.scorpiomiku.oldpeoplehome.R; import com.scorpiomiku.oldpeoplehome.adapter.PeopleSpinnerAdapter; import com.scorpiomiku.oldpeoplehome.base.BaseActivity; @@ -24,16 +22,15 @@ import com.scorpiomiku.oldpeoplehome.base.BaseFragment; import com.scorpiomiku.oldpeoplehome.modules.children.fragment.EnvironmentFragment; import com.scorpiomiku.oldpeoplehome.modules.children.fragment.HeartRateFragment; import com.scorpiomiku.oldpeoplehome.modules.children.fragment.MapFragment; -import com.scorpiomiku.oldpeoplehome.modules.children.fragment.MyInformationFragment; import com.scorpiomiku.oldpeoplehome.modules.children.fragment.SleepFragment; import com.scorpiomiku.oldpeoplehome.modules.children.fragment.StepFragment; -import com.scorpiomiku.oldpeoplehome.utils.LogUtils; import com.scorpiomiku.oldpeoplehome.utils.StatusBarUtils; import java.util.ArrayList; import butterknife.BindView; import butterknife.ButterKnife; +import butterknife.OnClick; /** * Created by ScorpioMiku on 2019/8/21. @@ -48,6 +45,12 @@ public class ChildMainActivity extends BaseActivity { BottomNavigationView navigation; @BindView(R.id.tool_bar) LinearLayout toolBar; + @BindView(R.id.avatar) + ImageView avatar; + @BindView(R.id.menu_layout) + FlowingMenuLayout menuLayout; + @BindView(R.id.drawerlayout) + FlowingDrawer drawerlayout; private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener; private FragmentManager fragmentManager; private BaseFragment[] fragments = { @@ -145,7 +148,7 @@ public class ChildMainActivity extends BaseActivity { fragmentTransaction.hide(fragments[4]); fragmentTransaction.commit(); StatusBarUtils.setWindowStatusBarColor(this, barColors[0]); -// spinner.setBackgroundColor(toolBarColors[0]); + spinner.setBackgroundColor(toolBarColors[0]); toolBar.setBackgroundColor(toolBarColors[0]); } @@ -160,7 +163,7 @@ public class ChildMainActivity extends BaseActivity { if (i == index) { fragmentTransaction.show(fragments[i]); StatusBarUtils.setWindowStatusBarColor(this, barColors[i]); -// spinner.setBackgroundColor(toolBarColors[i]); + spinner.setBackgroundColor(toolBarColors[i]); toolBar.setBackgroundColor(toolBarColors[i]); } else { fragmentTransaction.hide(fragments[i]); @@ -183,4 +186,9 @@ public class ChildMainActivity extends BaseActivity { = new PeopleSpinnerAdapter(getApplication(), oldPeopleList); spinner.setAdapter(adapter); } + + @OnClick(R.id.avatar) + public void onViewClicked() { + drawerlayout.openMenu(); + } } diff --git a/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml b/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml index cdb3170..1c08d8f 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/activity_child_main.xml @@ -1,83 +1,119 @@ - - + android:layout_height="match_parent"> + android:orientation="vertical"> - + - - - + android:orientation="horizontal" + tools:background="@color/colorPrimary"> - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + android:layout_height="match_parent"> - + + + diff --git a/android/OldPeopleHome/app/src/main/res/layout/child_main_spinner_item.xml b/android/OldPeopleHome/app/src/main/res/layout/child_main_spinner_item.xml index f5f8c35..8a82ffa 100644 --- a/android/OldPeopleHome/app/src/main/res/layout/child_main_spinner_item.xml +++ b/android/OldPeopleHome/app/src/main/res/layout/child_main_spinner_item.xml @@ -4,6 +4,7 @@ android:layout_height="30dp" android:layout_gravity="center" android:layout_margin="5dp" + android:background="#00000000" android:orientation="horizontal" android:padding="5dp"> @@ -11,6 +12,7 @@ android:id="@+id/spinner_avatar" android:layout_width="30dp" android:layout_height="30dp" + android:layout_marginLeft="10dp" android:scaleType="centerCrop" android:src="@drawable/test_avatar" /> @@ -19,6 +21,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:text="@string/app_name" /> + android:text="@string/app_name" + android:textColor="@color/text_gray" /> \ No newline at end of file diff --git a/android/OldPeopleHome/app/src/main/res/values/colors.xml b/android/OldPeopleHome/app/src/main/res/values/colors.xml index 1e36266..5dd40b6 100644 --- a/android/OldPeopleHome/app/src/main/res/values/colors.xml +++ b/android/OldPeopleHome/app/src/main/res/values/colors.xml @@ -17,4 +17,6 @@ #4766e4 #7096cc #FFF + + #999494 diff --git a/android/OldPeopleHome/app/src/main/res/values/styles.xml b/android/OldPeopleHome/app/src/main/res/values/styles.xml index 0eb88fe..9a1cbd3 100644 --- a/android/OldPeopleHome/app/src/main/res/values/styles.xml +++ b/android/OldPeopleHome/app/src/main/res/values/styles.xml @@ -8,4 +8,10 @@ @color/colorAccent + + +