diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml index 0b91b15..94f3df9 100644 --- a/app/src/main/res/layout/activity_check_manifest_detail.xml +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:padding="@dimen/dp_5"> + android:padding="@dimen/dp_5"> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查项目" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查标准" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查方法" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查依据" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml index 0b91b15..94f3df9 100644 --- a/app/src/main/res/layout/activity_check_manifest_detail.xml +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:padding="@dimen/dp_5"> + android:padding="@dimen/dp_5"> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查项目" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查标准" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查方法" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查依据" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 13c3b57..479e34a 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="2" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,检查结束" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml index 0b91b15..94f3df9 100644 --- a/app/src/main/res/layout/activity_check_manifest_detail.xml +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:padding="@dimen/dp_5"> + android:padding="@dimen/dp_5"> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查项目" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查标准" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查方法" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查依据" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 13c3b57..479e34a 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="2" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,检查结束" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml index 730fd4b..d63bae2 100644 --- a/app/src/main/res/layout/activity_preview_pdf.xml +++ b/app/src/main/res/layout/activity_preview_pdf.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml index 0b91b15..94f3df9 100644 --- a/app/src/main/res/layout/activity_check_manifest_detail.xml +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:padding="@dimen/dp_5"> + android:padding="@dimen/dp_5"> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查项目" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查标准" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查方法" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查依据" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 13c3b57..479e34a 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="2" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,检查结束" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml index 730fd4b..d63bae2 100644 --- a/app/src/main/res/layout/activity_preview_pdf.xml +++ b/app/src/main/res/layout/activity_preview_pdf.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml index dbeb93a..da1bdff 100644 --- a/app/src/main/res/drawable/bg_stroke_gray_1.xml +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -6,5 +6,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector.xml b/app/src/main/res/drawable/button_dialog_selector.xml deleted file mode 100644 index 48b7bd8..0000000 --- a/app/src/main/res/drawable/button_dialog_selector.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_blue.xml b/app/src/main/res/drawable/button_dialog_selector_blue.xml new file mode 100644 index 0000000..fe2dd30 --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_blue.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_selector_gray.xml b/app/src/main/res/drawable/button_dialog_selector_gray.xml new file mode 100644 index 0000000..193246c --- /dev/null +++ b/app/src/main/res/drawable/button_dialog_selector_gray.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_hidden_trouble.xml b/app/src/main/res/layout/activity_add_hidden_trouble.xml index 8d5bbc5..ade51ac 100644 --- a/app/src/main/res/layout/activity_add_hidden_trouble.xml +++ b/app/src/main/res/layout/activity_add_hidden_trouble.xml @@ -167,7 +167,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -178,7 +178,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_scene.xml b/app/src/main/res/layout/activity_check_manifest_by_scene.xml index b2f6589..d07dc9a 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_scene.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_scene.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_by_target.xml b/app/src/main/res/layout/activity_check_manifest_by_target.xml index 8c86fef..322f12f 100644 --- a/app/src/main/res/layout/activity_check_manifest_by_target.xml +++ b/app/src/main/res/layout/activity_check_manifest_by_target.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/dp_15" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,已知晓" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_check_manifest_detail.xml b/app/src/main/res/layout/activity_check_manifest_detail.xml index 0b91b15..94f3df9 100644 --- a/app/src/main/res/layout/activity_check_manifest_detail.xml +++ b/app/src/main/res/layout/activity_check_manifest_detail.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> + android:padding="@dimen/dp_5"> + android:padding="@dimen/dp_5"> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查项目" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查标准" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -112,7 +112,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查方法" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="检查依据" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 13c3b57..479e34a 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -56,7 +56,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="2" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_blue" android:text="确认,检查结束" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> @@ -67,7 +67,7 @@ android:layout_height="match_parent" android:layout_marginStart="@dimen/dp_15" android:layout_weight="1" - android:background="@drawable/button_dialog_selector" + android:background="@drawable/button_dialog_selector_gray" android:text="返回" android:textColor="@color/white" android:textSize="@dimen/lib_sp_16" /> diff --git a/app/src/main/res/layout/activity_preview_pdf.xml b/app/src/main/res/layout/activity_preview_pdf.xml index 730fd4b..d63bae2 100644 --- a/app/src/main/res/layout/activity_preview_pdf.xml +++ b/app/src/main/res/layout/activity_preview_pdf.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_hidden_trouble.xml b/app/src/main/res/layout/fragment_hidden_trouble.xml index 1a61481..801a44c 100644 --- a/app/src/main/res/layout/fragment_hidden_trouble.xml +++ b/app/src/main/res/layout/fragment_hidden_trouble.xml @@ -8,7 +8,6 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#193174" android:scrollbars="vertical" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />