diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 4143eb8..de49e1e 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white" /> + app:tabSelectedTextColor="@color/black" /> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 4143eb8..de49e1e 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white" /> + app:tabSelectedTextColor="@color/black" /> @@ -18,6 +16,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -26,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -41,6 +41,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -49,7 +50,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -64,6 +66,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -72,7 +75,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -87,6 +91,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -95,6 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 4143eb8..de49e1e 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white" /> + app:tabSelectedTextColor="@color/black" /> @@ -18,6 +16,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -26,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -41,6 +41,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -49,7 +50,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -64,6 +66,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -72,7 +75,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -87,6 +91,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -95,6 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 8d8b6d7..12a6941 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/dp_30" android:layout_marginHorizontal="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/bg_edit_text_theme_radius_10" + android:background="@drawable/bg_edit_text_bk_radius_5" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 4143eb8..de49e1e 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white" /> + app:tabSelectedTextColor="@color/black" /> @@ -18,6 +16,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -26,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -41,6 +41,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -49,7 +50,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -64,6 +66,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -72,7 +75,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -87,6 +91,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -95,6 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 8d8b6d7..12a6941 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/dp_30" android:layout_marginHorizontal="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/bg_edit_text_theme_radius_10" + android:background="@drawable/bg_edit_text_bk_radius_5" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/mipmap-xxxhdpi/notice.png b/app/src/main/res/mipmap-xxxhdpi/notice.png new file mode 100644 index 0000000..c89de17 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/notice.png Binary files differ diff --git a/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml new file mode 100644 index 0000000..37de186 --- /dev/null +++ b/app/src/main/res/drawable/bg_edit_text_bk_radius_5.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml b/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml deleted file mode 100644 index 09f53b4..0000000 --- a/app/src/main/res/drawable/bg_edit_text_theme_radius_10.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index 5fcc445..c16821e 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,9 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 5c7c717..7ede07b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -10,25 +10,20 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/mainBackground" /> + android:background="@color/white" /> - - @@ -43,13 +38,19 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@null" - android:hint="查询样品、业务" + android:hint="请输入关键字查询" android:singleLine="true" android:textColor="@color/mainTextColor" android:textColorHint="@color/hintColor" - android:textSize="@dimen/sp_16" /> + android:textSize="@dimen/sp_14" /> + + + android:padding="@dimen/dp_10"> - + + android:textSize="@dimen/sp_14" /> + android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml index 4143eb8..de49e1e 100644 --- a/app/src/main/res/layout/fragment_sample.xml +++ b/app/src/main/res/layout/fragment_sample.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white" /> + app:tabSelectedTextColor="@color/black" /> @@ -18,6 +16,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -26,7 +25,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已超期" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -41,6 +41,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -49,7 +50,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="已检定" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -64,6 +66,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -72,7 +75,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="检定总计" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> @@ -87,6 +91,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="@dimen/dp_5" android:fontFamily="sans-serif-black" + android:singleLine="true" android:text="0" android:textColor="@color/black" android:textSize="@dimen/sp_18" /> @@ -95,6 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="样品总数" - android:textColor="@color/mainTextColor" /> + android:textColor="@color/mainTextColor" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_search_input_title.xml b/app/src/main/res/layout/include_search_input_title.xml index 8d8b6d7..12a6941 100644 --- a/app/src/main/res/layout/include_search_input_title.xml +++ b/app/src/main/res/layout/include_search_input_title.xml @@ -17,7 +17,7 @@ android:layout_height="@dimen/dp_30" android:layout_marginHorizontal="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/bg_edit_text_theme_radius_10" + android:background="@drawable/bg_edit_text_bk_radius_5" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/mipmap-xxxhdpi/notice.png b/app/src/main/res/mipmap-xxxhdpi/notice.png new file mode 100644 index 0000000..c89de17 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/notice.png Binary files differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e155f22..e4b39de 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,8 +11,8 @@ #3d7eff #803d7eff #555555 - #F7F7FA - #E6E6E6 + #F0F0F0 + #CCCCCC #E4E4E4 #09BB07 \ No newline at end of file