diff --git a/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java b/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java index dc590c5..9ac15d5 100644 --- a/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java +++ b/app/src/main/java/com/sipai/jspatrol/Fault/DoingFaultDetailActivity.java @@ -464,7 +464,7 @@ public class DoingFaultDetailActivity extends AppCompatActivity implements View. } }); pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE); - pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4")); + pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688")); pDialog.setTitleText("数据上传中..."); pDialog.setCancelable(true); pDialog.setCanceledOnTouchOutside(true); diff --git a/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java b/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java index 7365e5d..96aba2c 100644 --- a/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java +++ b/app/src/main/java/com/sipai/jspatrol/Fault/NewFaultDetailActivity.java @@ -306,7 +306,7 @@ public class NewFaultDetailActivity extends AppCompatActivity implements View.On } }); pDialog = new SweetAlertDialog(this, SweetAlertDialog.PROGRESS_TYPE); - pDialog.getProgressHelper().setBarColor(Color.parseColor("#419DE4")); + pDialog.getProgressHelper().setBarColor(Color.parseColor("#009688")); pDialog.setTitleText("数据上传中..."); pDialog.setCancelable(true); pDialog.setCanceledOnTouchOutside(true); diff --git a/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java b/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java index 72bfc0b..09cb685 100644 --- a/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java +++ b/app/src/main/java/com/sipai/jspatrol/Main/fragment/mainfragment/MainFragment.java @@ -418,7 +418,7 @@ public class MainFragment extends BaseFragmentView - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_blue_status_sel.xml b/app/src/main/res/drawable/bg_blue_status_sel.xml index f137104..0ac87b8 100644 --- a/app/src/main/res/drawable/bg_blue_status_sel.xml +++ b/app/src/main/res/drawable/bg_blue_status_sel.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml b/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml index 8235417..cd4dd99 100644 --- a/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml +++ b/app/src/main/res/drawable/bg_layout_shape_btn_blue.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/drawable/bg_layout_shape_btn_login_blue.xml b/app/src/main/res/drawable/bg_layout_shape_btn_login_blue.xml new file mode 100644 index 0000000..8eb0dd4 --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_shape_btn_login_blue.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_patrol_task_detail.xml b/app/src/main/res/drawable/bg_patrol_task_detail.xml index 339868d..277dc39 100644 --- a/app/src/main/res/drawable/bg_patrol_task_detail.xml +++ b/app/src/main/res/drawable/bg_patrol_task_detail.xml @@ -1,7 +1,7 @@ - + 0 1 0 diff --git a/app/src/main/res/drawable/blue_selector.xml b/app/src/main/res/drawable/blue_selector.xml index 943ac80..b26713a 100644 --- a/app/src/main/res/drawable/blue_selector.xml +++ b/app/src/main/res/drawable/blue_selector.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_unpressed.xml b/app/src/main/res/drawable/btn_unpressed.xml index 8de826c..28ee571 100644 --- a/app/src/main/res/drawable/btn_unpressed.xml +++ b/app/src/main/res/drawable/btn_unpressed.xml @@ -11,6 +11,6 @@ android:right="10dp" android:bottom="10dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_checkbox_checked_teal.xml b/app/src/main/res/drawable/ic_checkbox_checked_teal.xml new file mode 100644 index 0000000..e64c504 --- /dev/null +++ b/app/src/main/res/drawable/ic_checkbox_checked_teal.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_checkbox_unchecked.xml b/app/src/main/res/drawable/ic_checkbox_unchecked.xml new file mode 100644 index 0000000..0ab8b24 --- /dev/null +++ b/app/src/main/res/drawable/ic_checkbox_unchecked.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_bg_little_blue.xml b/app/src/main/res/drawable/shape_bg_little_blue.xml index 4bcfae4..348243f 100644 --- a/app/src/main/res/drawable/shape_bg_little_blue.xml +++ b/app/src/main/res/drawable/shape_bg_little_blue.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_btn_confirm.xml b/app/src/main/res/drawable/shape_btn_confirm.xml index de58ea6..cc4f2c7 100644 --- a/app/src/main/res/drawable/shape_btn_confirm.xml +++ b/app/src/main/res/drawable/shape_btn_confirm.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/fault/layout/fragment_fault.xml b/app/src/main/res/layout/fault/layout/fragment_fault.xml index ca2b1b3..c403803 100644 --- a/app/src/main/res/layout/fault/layout/fragment_fault.xml +++ b/app/src/main/res/layout/fault/layout/fragment_fault.xml @@ -99,7 +99,7 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="#6179FF"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> + android:background="@color/main_theme_color"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 63dfb3e..022d71c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #419DE4 + #009688 #000000 #D81B60