diff --git "a/note/02_AndroidSystemUI\357\274\232\345\274\200\345\247\213\344\275\277\347\224\250NavigationDrawer.md" "b/note/02_AndroidSystemUI\357\274\232\345\274\200\345\247\213\344\275\277\347\224\250NavigationDrawer.md"
index 81e5402..01d57bd 100644
--- "a/note/02_AndroidSystemUI\357\274\232\345\274\200\345\247\213\344\275\277\347\224\250NavigationDrawer.md"
+++ "b/note/02_AndroidSystemUI\357\274\232\345\274\200\345\247\213\344\275\277\347\224\250NavigationDrawer.md"
@@ -1,4 +1,4 @@
-# 谈谈我眼中的 NavigationDrawer
+# 最详细的 NavigationDrawer 开发实践总结
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a016865..97c40ae 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -41,6 +41,9 @@
android:name=".ui.activity.navigation.SimpleNavigationDrawerActivity"
android:label="@string/simple_navigation_drawer"
android:theme="@style/Theme.Translucent.Navigation" />
+
diff --git a/src/main/java/com/clock/systemui/ui/activity/MainActivity.java b/src/main/java/com/clock/systemui/ui/activity/MainActivity.java
index 83da942..8b1b765 100644
--- a/src/main/java/com/clock/systemui/ui/activity/MainActivity.java
+++ b/src/main/java/com/clock/systemui/ui/activity/MainActivity.java
@@ -6,6 +6,7 @@
import android.view.View;
import com.clock.systemui.R;
+import com.clock.systemui.ui.activity.navigation.CloudMusicActivity;
import com.clock.systemui.ui.activity.navigation.SimpleDrawerActivity;
import com.clock.systemui.ui.activity.navigation.SimpleNavigationDrawerActivity;
import com.clock.systemui.ui.activity.toolbar.ToolBarActivity;
@@ -28,6 +29,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.btn_toolbar_zhihu).setOnClickListener(this);
findViewById(R.id.btn_simple_drawer).setOnClickListener(this);
findViewById(R.id.btn_simple_navigation_drawer).setOnClickListener(this);
+ findViewById(R.id.btn_cloud_music).setOnClickListener(this);
}
@@ -58,10 +60,14 @@ public void onClick(View v) {
Intent simpleDrawerIntent = new Intent(this, SimpleDrawerActivity.class);
startActivity(simpleDrawerIntent);
- } else if (viewId == R.id.btn_simple_navigation_drawer){
+ } else if (viewId == R.id.btn_simple_navigation_drawer) {
Intent simpleNavigationDrawerIntent = new Intent(this, SimpleNavigationDrawerActivity.class);
startActivity(simpleNavigationDrawerIntent);
+ } else if (viewId == R.id.btn_cloud_music) {
+ Intent cloudmusicIntent = new Intent(this, CloudMusicActivity.class);
+ startActivity(cloudmusicIntent);
+
}
}
}
diff --git a/src/main/java/com/clock/systemui/ui/activity/navigation/CloudMusicActivity.java b/src/main/java/com/clock/systemui/ui/activity/navigation/CloudMusicActivity.java
new file mode 100644
index 0000000..003cbe9
--- /dev/null
+++ b/src/main/java/com/clock/systemui/ui/activity/navigation/CloudMusicActivity.java
@@ -0,0 +1,21 @@
+package com.clock.systemui.ui.activity.navigation;
+
+import android.os.Bundle;
+
+import com.clock.systemui.R;
+import com.clock.systemui.ui.activity.base.BaseActivity;
+
+/**
+ * 仿网易云音乐
+ *
+ * @author Clock
+ * @since 2016-02-27
+ */
+public class CloudMusicActivity extends BaseActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_cloud_music);
+ }
+}
diff --git a/src/main/java/com/clock/systemui/ui/activity/navigation/SimpleNavigationDrawerActivity.java b/src/main/java/com/clock/systemui/ui/activity/navigation/SimpleNavigationDrawerActivity.java
index aaba991..792bf6e 100644
--- a/src/main/java/com/clock/systemui/ui/activity/navigation/SimpleNavigationDrawerActivity.java
+++ b/src/main/java/com/clock/systemui/ui/activity/navigation/SimpleNavigationDrawerActivity.java
@@ -27,8 +27,8 @@ protected void onCreate(Bundle savedInstanceState) {
mDrawer = (DrawerLayout) findViewById(R.id.drawer);
- mNavigationView = (NavigationView) findViewById(R.id.navigation_view);//ScrimInsetsFrameLayout
- mNavigationView.setItemIconTintList(null);//设置菜单图标的颜色
+ mNavigationView = (NavigationView) findViewById(R.id.navigation_view);
+ mNavigationView.setItemIconTintList(null);//设置菜单图标恢复本来的颜色
mNavigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(MenuItem item) {
diff --git a/src/main/res/layout/activity_cloud_music.xml b/src/main/res/layout/activity_cloud_music.xml
new file mode 100644
index 0000000..d1d78a5
--- /dev/null
+++ b/src/main/res/layout/activity_cloud_music.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml
index 9ede8d4..972afd2 100644
--- a/src/main/res/layout/activity_main.xml
+++ b/src/main/res/layout/activity_main.xml
@@ -50,4 +50,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Simple Navigation Drawer" />
+
+
diff --git a/src/main/res/layout/activity_simple_navigation_drawer.xml b/src/main/res/layout/activity_simple_navigation_drawer.xml
index 8a04685..9fd5009 100644
--- a/src/main/res/layout/activity_simple_navigation_drawer.xml
+++ b/src/main/res/layout/activity_simple_navigation_drawer.xml
@@ -4,20 +4,18 @@
android:id="@+id/drawer"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_cd3e3a">
+ android:fitsSystemWindows="true">
+ android:text="NavigationDrawerContent" />
diff --git a/src/main/res/mipmap-xhdpi/topinfo_ban_bg.png b/src/main/res/mipmap-xhdpi/topinfo_ban_bg.png
new file mode 100644
index 0000000..b7d36da
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/topinfo_ban_bg.png differ
diff --git a/src/main/res/mipmap-xhdpi/topmenu_icn_free.png b/src/main/res/mipmap-xhdpi/topmenu_icn_free.png
new file mode 100644
index 0000000..d0e4cdb
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/topmenu_icn_free.png differ
diff --git a/src/main/res/mipmap-xhdpi/topmenu_icn_member.png b/src/main/res/mipmap-xhdpi/topmenu_icn_member.png
new file mode 100644
index 0000000..ad4fbc6
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/topmenu_icn_member.png differ
diff --git a/src/main/res/mipmap-xhdpi/topmenu_icn_msg.png b/src/main/res/mipmap-xhdpi/topmenu_icn_msg.png
new file mode 100644
index 0000000..c724e1f
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/topmenu_icn_msg.png differ
diff --git a/src/main/res/mipmap-xhdpi/topmenu_icn_store.png b/src/main/res/mipmap-xhdpi/topmenu_icn_store.png
new file mode 100644
index 0000000..2bb26b7
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/topmenu_icn_store.png differ