陶汉栋 / ParentWork

Download as
Browse Code »

Commit 5ecc3e8e45933196fbda90e4b7831390b4edd4df

Authored by 陶汉栋
1 parent 067374b8
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 13 changed files with 124 additions and 312 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @5ecc3e8
@@ -75,28 +75,27 @@ @@ -75,28 +75,27 @@
75 <activity 75 <activity
76 android:name=".ui.activity.MyChildActivity" 76 android:name=".ui.activity.MyChildActivity"
77 android:screenOrientation="portrait" /> 77 android:screenOrientation="portrait" />
78 - <activity android:name=".ui.activity.consult.ConsultOneLevelActivity"></activity>  
79 - <!--<activity android:name=".ui.activity.LoginAndRegistActivity" />-->  
80 - <activity android:name=".ui.activity.StartActivity"  
81 - android:screenOrientation="portrait"  
82 - ></activity>  
83 - <activity android:name=".ui.activity.binding.SelectSchoolActivity" 78 + <activity android:name=".ui.activity.consult.ConsultOneLevelActivity" />
  79 + <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" /> -->
  80 + <activity
  81 + android:name=".ui.activity.StartActivity"
  82 + android:screenOrientation="portrait" />
  83 + <activity
  84 + android:name=".ui.activity.binding.SelectSchoolActivity"
84 android:screenOrientation="portrait" 85 android:screenOrientation="portrait"
85 - android:windowSoftInputMode="adjustPan|stateHidden"  
86 - ></activity>  
87 - <!--<activity android:name=".ui.activity.LoginAndRegistActivity"-->  
88 - <!--android:screenOrientation="portrait"-->  
89 - <!--/>-->  
90 - <activity android:name=".ui.activity.PersonInfoActivity" 86 + android:windowSoftInputMode="adjustPan|stateHidden" />
  87 + <!-- <activity android:name=".ui.activity.LoginAndRegistActivity" -->
  88 + <!-- android:screenOrientation="portrait" -->
  89 + <!-- /> -->
  90 + <activity
  91 + android:name=".ui.activity.PersonInfoActivity"
91 android:screenOrientation="portrait" 92 android:screenOrientation="portrait"
92 -  
93 - android:windowSoftInputMode="adjustPan|stateHidden"  
94 - />  
95 - <activity android:name=".ui.activity.binding.CheckInfoActivity" 93 + android:windowSoftInputMode="adjustPan|stateHidden" />
  94 + <activity
  95 + android:name=".ui.activity.binding.CheckInfoActivity"
96 android:screenOrientation="portrait" 96 android:screenOrientation="portrait"
97 -  
98 - android:windowSoftInputMode="adjustPan|stateHidden"  
99 - /> 97 + android:windowSoftInputMode="adjustPan|stateHidden" />
  98 + <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"></activity>
100 </application> 99 </application>
101 100
102 </manifest> 101 </manifest>
103 \ No newline at end of file 102 \ No newline at end of file
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultOneLevelActivity.java
  Diff comments   View file @5ecc3e8
@@ -20,11 +20,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. @@ -20,11 +20,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
20 context.startActivity(intent); 20 context.startActivity(intent);
21 } 21 }
22 22
23 - TextView tvLocalAddress;  
24 -  
25 EditText et_search; 23 EditText et_search;
26 24
27 - ImageView ivSearch; 25 + ImageView ivSearch,ivLocalAddress;
28 @Override 26 @Override
29 protected void initView(Bundle savedInstanceState) { 27 protected void initView(Bundle savedInstanceState) {
30 28
@@ -34,14 +32,12 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. @@ -34,14 +32,12 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
34 32
35 private void initViews() { 33 private void initViews() {
36 34
37 - tvLocalAddress=findViewById(R.id.tvLocalAddress);  
38 et_search=findViewById(R.id.et_search); 35 et_search=findViewById(R.id.et_search);
39 ivSearch=findViewById(R.id.ivSearch); 36 ivSearch=findViewById(R.id.ivSearch);
  37 + ivLocalAddress=findViewById(R.id.ivLocalAddress);
40 38
41 ivSearch.setOnClickListener(this); 39 ivSearch.setOnClickListener(this);
42 - tvLocalAddress.setBackgroundResource(R.drawable.back);  
43 - tvLocalAddress.setText("");  
44 - 40 + ivLocalAddress.setOnClickListener(this);
45 } 41 }
46 42
47 @Override 43 @Override
@@ -55,6 +51,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View. @@ -55,6 +51,9 @@ public class ConsultOneLevelActivity extends BaseCompatActivity implements View.
55 case R.id.ivSearch: 51 case R.id.ivSearch:
56 52
57 break; 53 break;
  54 + case R.id.ivLocalAddress:
  55 + finish();
  56 + break;
58 } 57 }
59 } 58 }
60 } 59 }
app/src/main/java/com/shunzhi/parent/ui/activity/consult/ConsultTwoLevelActivity.java 0 → 100644
  Diff comments   View file @5ecc3e8
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +package com.shunzhi.parent.ui.activity.consult;
  2 +
  3 +import android.support.v7.app.AppCompatActivity;
  4 +import android.os.Bundle;
  5 +
  6 +import com.share.mvpsdk.base.activity.BaseCompatActivity;
  7 +import com.shunzhi.parent.R;
  8 +
  9 +public class ConsultTwoLevelActivity extends BaseCompatActivity {
  10 +
  11 +
  12 + @Override
  13 + protected void initView(Bundle savedInstanceState) {
  14 +
  15 + }
  16 +
  17 + @Override
  18 + protected int getLayoutId() {
  19 + return R.layout.activity_consult_two_level;
  20 + }
  21 +}
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
  Diff comments   View file @5ecc3e8
@@ -24,7 +24,7 @@ public class ReportFragment extends BaseMVPCompatFragment { @@ -24,7 +24,7 @@ public class ReportFragment extends BaseMVPCompatFragment {
24 24
25 @Override 25 @Override
26 public void initUI(View view, @Nullable Bundle savedInstanceState) { 26 public void initUI(View view, @Nullable Bundle savedInstanceState) {
27 - 27 +
28 } 28 }
29 29
30 30
app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
  Diff comments   View file @5ecc3e8
@@ -67,6 +67,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements Vi @@ -67,6 +67,7 @@ public class ConsultOneLevelFragment extends BaseMVPCompatFragment implements Vi
67 } 67 }
68 68
69 private void initViews(View view) { 69 private void initViews(View view) {
  70 +
70 textAndImg1 = view.findViewById(R.id.textAndImg1); 71 textAndImg1 = view.findViewById(R.id.textAndImg1);
71 textAndImg2 = view.findViewById(R.id.textAndImg2); 72 textAndImg2 = view.findViewById(R.id.textAndImg2);
72 textAndImg3 = view.findViewById(R.id.textAndImg3); 73 textAndImg3 = view.findViewById(R.id.textAndImg3);
app/src/main/res/layout/activity_consult_one_level.xml
  Diff comments   View file @5ecc3e8
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 android:orientation="vertical" 7 android:orientation="vertical"
8 tools:context="com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity"> 8 tools:context="com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity">
9 9
10 - <include layout="@layout/layout_search"/> 10 + <include layout="@layout/layout_search_back"/>
11 11
12 12
13 <fragment 13 <fragment
app/src/main/res/layout/activity_consult_two_level.xml 0 → 100644
  Diff comments   View file @5ecc3e8
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + xmlns:tools="http://schemas.android.com/tools"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + android:orientation="vertical"
  8 + android:background="@color/bgColor"
  9 + tools:context="com.shunzhi.parent.ui.activity.consult.ConsultTwoLevelActivity">
  10 +
  11 +<include layout="@layout/layout_search_back"/>
  12 +<TextView
  13 + android:layout_width="match_parent"
  14 + android:layout_height="wrap_content"
  15 + android:textSize="@dimen/textSize16"
  16 + android:textColor="@color/textColor"
  17 + android:text="政策咨询"
  18 + android:gravity="center"
  19 + android:paddingTop="@dimen/size_dp_5"
  20 + android:paddingBottom="@dimen/size_dp_5"
  21 + />
  22 +
  23 + <android.support.v7.widget.RecyclerView
  24 + android:layout_marginLeft="@dimen/size_dp_10"
  25 + android:layout_marginRight="@dimen/size_dp_10"
  26 + android:id="@+id/recyclerView"
  27 + android:layout_width="match_parent"
  28 + android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
  29 +
  30 +</LinearLayout>
app/src/main/res/layout/fragment_report.xml
  Diff comments   View file @5ecc3e8
@@ -5,12 +5,6 @@ @@ -5,12 +5,6 @@
5 android:orientation="vertical" 5 android:orientation="vertical"
6 tools:context="com.shunzhi.parent.ui.fragment.ReportFragment"> 6 tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
7 7
8 -<<<<<<< HEAD  
9 - <FrameLayout  
10 - android:layout_width="match_parent"  
11 - android:layout_height="?android:actionBarSize"  
12 - android:background="@color/titleColor">  
13 -=======  
14 <!-- TODO: Update blank fragment layout --> 8 <!-- TODO: Update blank fragment layout -->
15 <LinearLayout 9 <LinearLayout
16 android:layout_width="match_parent" 10 android:layout_width="match_parent"
@@ -76,38 +70,4 @@ @@ -76,38 +70,4 @@
76 70
77 </android.support.v7.widget.RecyclerView> 71 </android.support.v7.widget.RecyclerView>
78 </LinearLayout> 72 </LinearLayout>
79 ->>>>>>> 91d4262102c69d0c070bfc0895a51c51b717175b  
80 -  
81 - <TextView  
82 - android:id="@+id/tvLocalAddress"  
83 - android:layout_width="wrap_content"  
84 - android:layout_height="match_parent"  
85 - android:drawablePadding="@dimen/size_dp_5"  
86 - android:drawableRight="@drawable/pull"  
87 - android:gravity="center"  
88 - android:paddingLeft="@dimen/size_dp_15"  
89 - android:text="马博晒"  
90 - android:textColor="@color/textColor"  
91 - android:textSize="@dimen/textSize16" />  
92 -  
93 - <TextView  
94 - style="@style/TextView_Wrap_16"  
95 - android:layout_gravity="center"  
96 - android:gravity="center"  
97 - android:text="2018年8月"  
98 - android:textColor="@color/textColor" />  
99 -  
100 -  
101 - <TextView  
102 - style="@style/TextView_Wrap_16"  
103 - android:layout_height="match_parent"  
104 - android:paddingRight="@dimen/size_dp_15"  
105 - android:layout_gravity="right"  
106 - android:gravity="center"  
107 - android:text="筛选"  
108 - android:drawableRight="@drawable/shaixuan"  
109 - android:drawablePadding="@dimen/size_dp_5"  
110 - android:textColor="@color/textColor" />  
111 -  
112 - </FrameLayout>  
113 </LinearLayout> 73 </LinearLayout>
app/src/main/res/layout/fragment_report_BACKUP_12928.xml
View file @067374b
@@ -1,113 +0,0 @@ @@ -1,113 +0,0 @@
1 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
2 - xmlns:tools="http://schemas.android.com/tools"  
3 - android:layout_width="match_parent"  
4 - android:layout_height="match_parent"  
5 - android:orientation="vertical"  
6 - tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">  
7 -  
8 -<<<<<<< HEAD  
9 - <FrameLayout  
10 - android:layout_width="match_parent"  
11 - android:layout_height="?android:actionBarSize"  
12 - android:background="@color/titleColor">  
13 -=======  
14 - <!-- TODO: Update blank fragment layout -->  
15 -<LinearLayout  
16 - android:layout_width="match_parent"  
17 - android:layout_height="match_parent"  
18 - android:orientation="vertical"  
19 - >  
20 -<LinearLayout  
21 - android:id="@+id/top_layout"  
22 - android:layout_width="match_parent"  
23 - android:layout_height="?android:actionBarSize"  
24 - android:orientation="horizontal"  
25 - android:padding="10dp"  
26 - android:background="@color/back_top"  
27 - >  
28 -  
29 - <TextView  
30 - android:layout_width="wrap_content"  
31 - android:layout_height="wrap_content"  
32 - android:text="马铂骞"  
33 - android:drawableRight="@drawable/pull"  
34 - android:drawablePadding="10dp"  
35 - android:textColor="@color/textColor"  
36 - android:textSize="@dimen/textSize16"  
37 - android:layout_gravity="center_vertical"  
38 - />  
39 -<TextView  
40 - android:layout_width="wrap_content"  
41 - android:layout_height="wrap_content"  
42 - android:layout_weight="1"  
43 - android:text="2018年3月"  
44 - android:gravity="center_horizontal"  
45 - android:layout_gravity="center_vertical"  
46 - android:textColor="@color/textColor"  
47 - android:textSize="@dimen/textSize16"  
48 - />  
49 - <TextView  
50 - android:layout_width="wrap_content"  
51 - android:layout_height="wrap_content"  
52 - android:text="筛选"  
53 - android:layout_gravity="center_vertical"  
54 - android:textColor="@color/textColor"  
55 - android:textSize="@dimen/textSize16"  
56 - android:drawableRight="@drawable/screen"  
57 - />  
58 -</LinearLayout>  
59 -<LinearLayout  
60 - android:layout_width="match_parent"  
61 - android:layout_height="60dp">  
62 -<TextView  
63 - android:layout_width="match_parent"  
64 - android:layout_height="match_parent"  
65 - android:text="日期控件"  
66 - android:textColor="@color/white"  
67 - android:gravity="center"  
68 - android:background="@color/textRed"  
69 - />  
70 -  
71 -</LinearLayout>  
72 -<android.support.v7.widget.RecyclerView  
73 - android:id="@+id/recycle_report"  
74 - android:layout_width="match_parent"  
75 - android:layout_height="match_parent">  
76 -  
77 -</android.support.v7.widget.RecyclerView>  
78 -</LinearLayout>  
79 ->>>>>>> 91d4262102c69d0c070bfc0895a51c51b717175b  
80 -  
81 - <TextView  
82 - android:id="@+id/tvLocalAddress"  
83 - android:layout_width="wrap_content"  
84 - android:layout_height="match_parent"  
85 - android:drawablePadding="@dimen/size_dp_5"  
86 - android:drawableRight="@drawable/pull"  
87 - android:gravity="center"  
88 - android:paddingLeft="@dimen/size_dp_15"  
89 - android:text="马博晒"  
90 - android:textColor="@color/textColor"  
91 - android:textSize="@dimen/textSize16" />  
92 -  
93 - <TextView  
94 - style="@style/TextView_Wrap_16"  
95 - android:layout_gravity="center"  
96 - android:gravity="center"  
97 - android:text="2018年8月"  
98 - android:textColor="@color/textColor" />  
99 -  
100 -  
101 - <TextView  
102 - style="@style/TextView_Wrap_16"  
103 - android:layout_height="match_parent"  
104 - android:paddingRight="@dimen/size_dp_15"  
105 - android:layout_gravity="right"  
106 - android:gravity="center"  
107 - android:text="筛选"  
108 - android:drawableRight="@drawable/shaixuan"  
109 - android:drawablePadding="@dimen/size_dp_5"  
110 - android:textColor="@color/textColor" />  
111 -  
112 - </FrameLayout>  
113 -</LinearLayout>  
app/src/main/res/layout/fragment_report_BASE_12928.xml
View file @067374b
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"  
2 - xmlns:tools="http://schemas.android.com/tools"  
3 - android:layout_width="match_parent"  
4 - android:layout_height="match_parent"  
5 - tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">  
6 -  
7 - <!-- TODO: Update blank fragment layout -->  
8 - <TextView  
9 - android:layout_width="match_parent"  
10 - android:layout_height="match_parent"  
11 - android:text="@string/hello_blank_fragment" />  
12 -  
13 -</FrameLayout>  
app/src/main/res/layout/fragment_report_LOCAL_12928.xml
View file @067374b
@@ -1,45 +0,0 @@ @@ -1,45 +0,0 @@
1 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"  
2 - xmlns:tools="http://schemas.android.com/tools"  
3 - android:layout_width="match_parent"  
4 - android:layout_height="match_parent"  
5 - android:orientation="vertical"  
6 - tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">  
7 -  
8 - <FrameLayout  
9 - android:layout_width="match_parent"  
10 - android:layout_height="?android:actionBarSize"  
11 - android:background="@color/titleColor">  
12 -  
13 - <TextView  
14 - android:id="@+id/tvLocalAddress"  
15 - android:layout_width="wrap_content"  
16 - android:layout_height="match_parent"  
17 - android:drawablePadding="@dimen/size_dp_5"  
18 - android:drawableRight="@drawable/pull"  
19 - android:gravity="center"  
20 - android:paddingLeft="@dimen/size_dp_15"  
21 - android:text="马博晒"  
22 - android:textColor="@color/textColor"  
23 - android:textSize="@dimen/textSize16" />  
24 -  
25 - <TextView  
26 - style="@style/TextView_Wrap_16"  
27 - android:layout_gravity="center"  
28 - android:gravity="center"  
29 - android:text="2018年8月"  
30 - android:textColor="@color/textColor" />  
31 -  
32 -  
33 - <TextView  
34 - style="@style/TextView_Wrap_16"  
35 - android:layout_height="match_parent"  
36 - android:paddingRight="@dimen/size_dp_15"  
37 - android:layout_gravity="right"  
38 - android:gravity="center"  
39 - android:text="筛选"  
40 - android:drawableRight="@drawable/shaixuan"  
41 - android:drawablePadding="@dimen/size_dp_5"  
42 - android:textColor="@color/textColor" />  
43 -  
44 - </FrameLayout>  
45 -</LinearLayout>  
app/src/main/res/layout/fragment_report_REMOTE_12928.xml
View file @067374b
@@ -1,73 +0,0 @@ @@ -1,73 +0,0 @@
1 -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"  
2 - xmlns:tools="http://schemas.android.com/tools"  
3 - android:layout_width="match_parent"  
4 - android:layout_height="match_parent"  
5 - tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">  
6 -  
7 - <!-- TODO: Update blank fragment layout -->  
8 -<LinearLayout  
9 - android:layout_width="match_parent"  
10 - android:layout_height="match_parent"  
11 - android:orientation="vertical"  
12 - >  
13 -<LinearLayout  
14 - android:id="@+id/top_layout"  
15 - android:layout_width="match_parent"  
16 - android:layout_height="?android:actionBarSize"  
17 - android:orientation="horizontal"  
18 - android:padding="10dp"  
19 - android:background="@color/back_top"  
20 - >  
21 -  
22 - <TextView  
23 - android:layout_width="wrap_content"  
24 - android:layout_height="wrap_content"  
25 - android:text="马铂骞"  
26 - android:drawableRight="@drawable/pull"  
27 - android:drawablePadding="10dp"  
28 - android:textColor="@color/textColor"  
29 - android:textSize="@dimen/textSize16"  
30 - android:layout_gravity="center_vertical"  
31 - />  
32 -<TextView  
33 - android:layout_width="wrap_content"  
34 - android:layout_height="wrap_content"  
35 - android:layout_weight="1"  
36 - android:text="2018年3月"  
37 - android:gravity="center_horizontal"  
38 - android:layout_gravity="center_vertical"  
39 - android:textColor="@color/textColor"  
40 - android:textSize="@dimen/textSize16"  
41 - />  
42 - <TextView  
43 - android:layout_width="wrap_content"  
44 - android:layout_height="wrap_content"  
45 - android:text="筛选"  
46 - android:layout_gravity="center_vertical"  
47 - android:textColor="@color/textColor"  
48 - android:textSize="@dimen/textSize16"  
49 - android:drawableRight="@drawable/screen"  
50 - />  
51 -</LinearLayout>  
52 -<LinearLayout  
53 - android:layout_width="match_parent"  
54 - android:layout_height="60dp">  
55 -<TextView  
56 - android:layout_width="match_parent"  
57 - android:layout_height="match_parent"  
58 - android:text="日期控件"  
59 - android:textColor="@color/white"  
60 - android:gravity="center"  
61 - android:background="@color/textRed"  
62 - />  
63 -  
64 -</LinearLayout>  
65 -<android.support.v7.widget.RecyclerView  
66 - android:id="@+id/recycle_report"  
67 - android:layout_width="match_parent"  
68 - android:layout_height="match_parent">  
69 -  
70 -</android.support.v7.widget.RecyclerView>  
71 -</LinearLayout>  
72 -  
73 -</FrameLayout>  
app/src/main/res/layout/layout_search_back.xml 0 → 100644
  Diff comments   View file @5ecc3e8
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="?android:actionBarSize"
  5 + android:background="@color/titleColor">
  6 +
  7 + <ImageView
  8 + android:id="@+id/ivLocalAddress"
  9 + android:layout_width="wrap_content"
  10 + android:layout_height="match_parent"
  11 + android:gravity="center"
  12 + android:paddingLeft="@dimen/size_dp_15"
  13 + android:src="@drawable/back"
  14 + android:paddingRight="@dimen/size_dp_15"
  15 + android:textColor="@color/textColor"
  16 + android:textSize="@dimen/textSize16" />
  17 +
  18 + <FrameLayout
  19 + android:layout_width="match_parent"
  20 + android:layout_height="match_parent"
  21 + android:focusable="true"
  22 + android:focusableInTouchMode="true">
  23 +
  24 + <EditText
  25 + android:id="@+id/et_search"
  26 + android:layout_width="match_parent"
  27 + android:layout_height="match_parent"
  28 + android:layout_margin="@dimen/size_dp_10"
  29 + android:background="@drawable/shape_edit_radius4_white"
  30 + android:gravity="center"
  31 + android:hint="请输入搜索内容"
  32 + android:textSize="@dimen/textSize16" />
  33 +
  34 + <ImageView
  35 + android:id="@+id/ivSearch"
  36 + android:layout_width="wrap_content"
  37 + android:layout_height="match_parent"
  38 + android:layout_gravity="right"
  39 + android:paddingLeft="@dimen/size_dp_15"
  40 + android:background="?android:selectableItemBackground"
  41 + android:paddingRight="@dimen/size_dp_15"
  42 + android:src="@drawable/search_black" />
  43 +
  44 + </FrameLayout>
  45 +
  46 +</LinearLayout>
0 \ No newline at end of file 47 \ No newline at end of file