Skip to content

Commit e3c3b34

Browse files
author
xuyisheng
committed
modify
1 parent d194338 commit e3c3b34

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.hujiang.designsupportlibrarydemo" >
2+
<manifest package="com.hujiang.designsupportlibrarydemo"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<application
66
android:allowBackup="true"
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
9-
android:theme="@style/Theme.DesignDemo" >
9+
android:theme="@style/Theme.DesignDemo">
1010
<activity
1111
android:name=".MainActivity"
12-
android:label="@string/app_name" >
12+
android:label="@string/app_name">
1313
<intent-filter>
14-
<action android:name="android.intent.action.MAIN" />
14+
<action android:name="android.intent.action.MAIN"/>
1515

16-
<category android:name="android.intent.category.LAUNCHER" />
16+
<category android:name="android.intent.category.LAUNCHER"/>
1717
</intent-filter>
1818
</activity>
1919

app/src/main/java/com/hujiang/designsupportlibrarydemo/DetailActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.os.Bundle;
44
import android.support.design.widget.CollapsingToolbarLayout;
55
import android.support.v7.app.AppCompatActivity;
6+
import android.widget.ImageView;
67

78
public class DetailActivity extends AppCompatActivity {
89

@@ -15,5 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1516
(CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
1617
collapsingToolbar.setTitle("ABSBCS");
1718

19+
ImageView imageView = (ImageView) findViewById(R.id.backdrop);
20+
imageView.setImageResource(R.mipmap.ic_launcher);
1821
}
1922
}

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<android.support.v4.widget.DrawerLayout
2+
android:id="@+id/dl_main_drawer"
23
xmlns:android="http://schemas.android.com/apk/res/android"
34
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/dl_main_drawer"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:fitsSystemWindows="true">
88

99
<include layout="@layout/navigation_content"/>
1010

1111
<android.support.design.widget.NavigationView
12+
android:id="@+id/nv_main_navigation"
1213
android:layout_width="wrap_content"
1314
android:layout_height="match_parent"
1415
android:layout_gravity="start"
15-
android:id="@+id/nv_main_navigation"
1616
app:headerLayout="@layout/navigation_header"
1717
app:menu="@menu/drawer_view"/>
1818

app/src/main/res/menu/drawer_view.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
<item
77
android:id="@+id/nav_home"
88
android:icon="@drawable/ic_dashboard"
9-
android:title="CC Talk" />
9+
android:title="CC Talk"/>
1010
<item
1111
android:id="@+id/nav_messages"
1212
android:icon="@drawable/ic_event"
13-
android:title="HJ Class" />
13+
android:title="HJ Class"/>
1414
<item
1515
android:id="@+id/nav_friends"
1616
android:icon="@drawable/ic_headset"
17-
android:title="Words" />
17+
android:title="Words"/>
1818
<item
1919
android:id="@+id/nav_discussion"
2020
android:icon="@drawable/ic_forum"
21-
android:title="Big HJ" />
21+
android:title="Big HJ"/>
2222
</group>
2323

2424
<item android:title="Sub items">
2525
<menu>
2626
<item
2727
android:icon="@drawable/ic_dashboard"
28-
android:title="Android" />
28+
android:title="Android"/>
2929
<item
3030
android:icon="@drawable/ic_forum"
31-
android:title="iOS" />
31+
android:title="iOS"/>
3232
</menu>
3333
</item>
3434

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto">
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
44
<item
55
android:id="@+id/action_settings"
66
android:title="@string/menu_settings"
7-
app:showAsAction="never" />
7+
app:showAsAction="never"/>
88
</menu>

0 commit comments

Comments
 (0)