From 4749bc66cd8ac7958bb1a417b191144e5c346d1d Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Thu, 18 May 2023 17:17:08 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=B8=83=E5=B1=80=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?2560=E5=B0=BA=E5=AF=B8=202=E3=80=81=E4=BC=98=E5=8C=96=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E9=9D=A2=E6=9D=BFUI=203=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=84=E6=B5=8B=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8UI=204?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?UI=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omqs/ui/activity/map/MainActivity.kt | 32 +- .../navinfo/omqs/ui/dialog/CommonDialog.java | 11 +- .../EvaluationResultFragment.kt | 4 + .../fragment/evaluationresult/LeftAdapter.kt | 4 +- .../evaluationresult/MiddleAdapter.kt | 4 +- .../evaluationresult/PhenomenonFragment.kt | 19 +- .../evaluationresult/ProblemLinkFragment.kt | 16 +- .../personalcenter/PersonalCenterFragment.kt | 2 +- .../omqs/ui/fragment/tasklist/TaskAdapter.kt | 70 ++++ .../omqs/ui/fragment/tasklist/TaskFragment.kt | 104 ++++++ .../ui/fragment/tasklist/TaskListAdapter.kt | 42 ++- .../ui/fragment/tasklist/TaskListFragment.kt | 28 +- .../fragment/tasklist/TaskManagerAdapter.kt | 25 ++ .../fragment/tasklist/TaskManagerFragment.kt | 64 ++++ ...{TaskListViewModel.kt => TaskViewModel.kt} | 117 ++++++- .../com/navinfo/omqs/ui/widget/SignUtil.kt | 78 ++--- app/src/main/res/color/btn_blue_white.xml | 8 - app/src/main/res/color/font_blue_reg.xml | 6 - ..._default_text_color_black_enable_white.xml | 8 - .../baseline_delete_forever_24.xml | 13 +- .../drawable-v24/baseline_edit_note_48.xml | 5 + .../baseline_edit_note_48_select.xml | 5 + .../baseline_keyboard_arrow_down_12.xml | 5 + .../drawable-v24/baseline_my_location_24.xml | 5 - .../res/drawable-v24/baseline_save_24.xml | 5 - .../ic_baseline_check_24.xml | 0 .../ic_baseline_format_list_bulleted_24.xml | 0 .../ic_baseline_generating_tokens_24.xml | 0 .../ic_baseline_keyboard_arrow_down_24.xml | 0 .../ic_baseline_keyboard_arrow_left_24.xml | 0 .../ic_baseline_keyboard_arrow_right_24.xml | 0 .../ic_baseline_layers_24.xml | 0 .../ic_baseline_playlist_add_check_24.xml | 0 .../ic_baseline_scatter_plot_24.xml | 0 .../drawable-v24/ic_baseline_search_24.xml | 5 + .../ic_baseline_sim_card_download_24.xml | 16 +- .../drawable-v24/ic_launcher_foreground.xml | 30 -- .../main/res/drawable-xhdpi/icon_2d_3d.png | Bin 7259 -> 0 bytes .../main/res/drawable-xhdpi/icon_add_data.png | Bin 4879 -> 0 bytes .../res/drawable-xhdpi/icon_add_voice.png | Bin 5188 -> 0 bytes .../icon_back_n.png | Bin .../icon_back_p.png | Bin .../res/drawable-xhdpi/icon_calc_disance.png | Bin 6379 -> 0 bytes .../main/res/drawable-xhdpi/icon_camera.png | Bin 1391 -> 0 bytes .../main/res/drawable-xhdpi/icon_delete_p.png | Bin 511 -> 0 bytes .../main/res/drawable-xhdpi/icon_location.png | Bin 6304 -> 0 bytes .../res/drawable-xhdpi/icon_page_video_a1.png | Bin 3427 -> 0 bytes app/src/main/res/drawable-xhdpi/icon_save.png | Bin 12380 -> 0 bytes .../main/res/drawable-xhdpi/icon_serach.png | Bin 6735 -> 0 bytes .../main/res/drawable-xhdpi/icon_trace.png | Bin 6313 -> 0 bytes .../main/res/drawable-xhdpi/icon_voice.png | Bin 1415 -> 0 bytes .../login_bg.png | Bin .../login_password.png | Bin .../login_username.png | Bin .../point_blue.png | Bin .../bg_sign.png | Bin .../main/res/drawable-xxhdpi/icon_2d_3d.png | Bin 8321 -> 3998 bytes .../res/drawable-xxhdpi/icon_add_data.png | Bin 5941 -> 3084 bytes .../res/drawable-xxhdpi/icon_add_voice.png | Bin 6353 -> 3507 bytes .../res/drawable-xxhdpi/icon_calc_disance.png | Bin 7348 -> 3007 bytes .../main/res/drawable-xxhdpi/icon_camera.png | Bin 1677 -> 0 bytes .../main/res/drawable-xxhdpi/icon_clear.png | Bin 0 -> 1087 bytes .../res/drawable-xxhdpi/icon_delete_p.png | Bin 511 -> 0 bytes .../drawable-xxhdpi/icon_fragment_close.png | Bin 0 -> 1984 bytes .../icon_fragment_switch_off.png | Bin 0 -> 3046 bytes .../icon_fragment_switch_on.png | Bin 0 -> 3077 bytes .../icon_kind_code.png | Bin .../icon_kind_code_k1.png | Bin .../icon_kind_code_k10.png | Bin .../icon_kind_code_k11.png | Bin .../icon_kind_code_k13.png | Bin .../icon_kind_code_k15.png | Bin .../icon_kind_code_k2.png | Bin .../icon_kind_code_k3.png | Bin .../icon_kind_code_k4.png | Bin .../icon_kind_code_k6.png | Bin .../icon_kind_code_k7.png | Bin .../icon_kind_code_k8.png | Bin .../icon_kind_code_k9.png | Bin .../icon_lane_num1.png | Bin .../icon_lane_num10.png | Bin .../icon_lane_num11.png | Bin .../icon_lane_num12.png | Bin .../icon_lane_num2.png | Bin .../icon_lane_num3.png | Bin .../icon_lane_num4.png | Bin .../icon_lane_num5.png | Bin .../icon_lane_num6.png | Bin .../icon_lane_num7.png | Bin .../icon_lane_num8.png | Bin .../icon_lane_num9.png | Bin .../res/drawable-xxhdpi/icon_location.png | Bin 6833 -> 3217 bytes .../drawable-xxhdpi/icon_main_geometry.png | Bin 0 -> 1086 bytes .../drawable-xxhdpi/icon_page_video_a1.png | Bin 8382 -> 2321 bytes .../icon_road_direction.png | Bin .../main/res/drawable-xxhdpi/icon_save.png | Bin 12380 -> 994 bytes .../main/res/drawable-xxhdpi/icon_serach.png | Bin 8613 -> 3014 bytes .../main/res/drawable-xxhdpi/icon_task.png | Bin 0 -> 1615 bytes .../res/drawable-xxhdpi/icon_task_select.png | Bin 0 -> 2061 bytes .../main/res/drawable-xxhdpi/icon_trace.png | Bin 7570 -> 2390 bytes .../main/res/drawable-xxhdpi/icon_voice.png | Bin 1509 -> 0 bytes .../main/res/drawable-xxhdpi/icon_zoom_in.png | Bin 0 -> 584 bytes .../res/drawable-xxhdpi/icon_zoom_out.png | Bin 0 -> 217 bytes .../login_bg.png | Bin .../login_password.png | Bin .../login_username.png | Bin .../main/res/drawable/bg_select_sound_xml.xml | 6 - app/src/main/res/drawable/btn_back_xml.xml | 6 - app/src/main/res/drawable/dialog_bg.xml | 14 - .../main/res/drawable/dialog_bg_cancel.xml | 23 -- app/src/main/res/drawable/dialog_bg_ok.xml | 23 -- .../drawable_bg_tittle_blue_bg_4_radius.xml | 14 - .../drawable_bg_white_bg_4_radius.xml | 14 - .../res/drawable/fm_card_map_btn_bg_line.xml | 26 -- .../drawable/fm_card_map_down_status_bg.xml | 44 --- .../res/drawable/ic_baseline_search_24.xml | 5 - .../res/drawable/ic_launcher_background.xml | 170 ---------- app/src/main/res/drawable/icon_down_arrow.png | Bin 235 -> 0 bytes .../main/res/drawable/icon_item_high_bg.9.png | Bin 840 -> 0 bytes .../main/res/drawable/icon_map_zoom_in.xml | 6 + .../main/res/drawable/icon_map_zoom_out.xml | 6 + .../drawable/icon_select_sound_defaule.9.png | Bin 67532 -> 0 bytes .../drawable/icon_select_sound_press.9.png | Bin 66754 -> 0 bytes .../main/res/drawable/ripple_btn_checked.xml | 6 - .../main/res/drawable/ripple_btn_normal.xml | 15 +- .../ripple_fragment_save_botton_bg.xml | 12 + .../selector_adapter_item_select_bg.xml | 5 + .../selector_bg_blue_gray_bg_4_radius.xml | 8 +- .../selector_bg_gradient_checkbox.xml | 10 +- .../res/drawable/selector_bg_video_button.xml | 8 - .../selector_bg_white_blue_bg_4_radius.xml | 9 - ...lete_xml.xml => selector_btn_back_xml.xml} | 6 +- ...efault.xml => selector_btn_bg_default.xml} | 0 .../selector_default_button_white_bg.xml | 5 + ...r_default_text_color_white_enable_gray.xml | 6 - .../res/drawable/selector_fragment_switch.xml | 5 + .../res/drawable/selector_road_line_bg.xml | 5 + .../drawable/selector_road_line_btn_bg.xml | 5 - .../main/res/drawable/selector_task_head.xml | 5 + .../drawable/selector_task_link_edit_icon.xml | 5 + .../main/res/drawable/selector_zoom_in_bg.xml | 5 + .../res/drawable/selector_zoom_out_bg.xml | 5 + ...dius.xml => shape_bg_blue_bg_4_radius.xml} | 0 app/src/main/res/drawable/shape_btn_check.xml | 8 - ...d.xml => shape_btn_connect_bg_enabled.xml} | 6 +- .../main/res/drawable/shape_btn_normal.xml | 10 - ...bg.xml => shape_btn_red_disconnect_bg.xml} | 0 .../res/drawable/shape_btn_video_press.xml | 13 - .../res/drawable/shape_card_bg_default.xml | 26 -- .../res/drawable/shape_card_bg_select.xml | 26 -- .../shape_default_inputlayout_white_bg.xml | 9 + ...d_limit.xml => shape_icon_speed_limit.xml} | 0 ...off.xml => shape_icon_speed_limit_off.xml} | 0 ..._radius.xml => shape_left_fragment_bg.xml} | 24 +- ..._bg.xml => shape_login_inputlayout_bg.xml} | 0 .../res/drawable/shape_middle_fragment_bg.xml | 19 ++ .../res/drawable/shape_rect_blue_6dp_bg.xml | 13 + .../drawable/shape_rect_e0dfe3_12dp_bg.xml | 13 + .../res/drawable/shape_rect_white_2dp_bg.xml | 13 + .../res/drawable/shape_rect_white_6dp_bg.xml | 13 + .../res/drawable/shape_rect_white_8dp_bg.xml | 11 + .../shape_rect_white_press_6dp_bg.xml | 13 + .../res/drawable/shape_right_fragment_bg.xml | 19 ++ .../main/res/drawable/shape_zoom_in_bg.xml | 12 + .../res/drawable/shape_zoom_in_press_bg.xml | 12 + .../main/res/drawable/shape_zoom_out_bg.xml | 12 + .../res/drawable/shape_zoom_out_press_bg.xml | 11 + app/src/main/res/layout/activity_login.xml | 10 +- app/src/main/res/layout/activity_main.xml | 298 +++++++++-------- .../res/layout/adapter_offline_map_city.xml | 2 +- app/src/main/res/layout/adapter_sign.xml | 4 +- .../main/res/layout/adapter_sound_list.xml | 2 +- app/src/main/res/layout/adapter_task.xml | 52 +++ app/src/main/res/layout/adapter_task_list.xml | 50 +-- .../main/res/layout/connect_out_camera.xml | 1 - .../layout/cv_card_voice_rcd_hint_window.xml | 6 +- .../main/res/layout/cv_map_top_right_menu.xml | 37 --- app/src/main/res/layout/dialog_default.xml | 10 +- .../main/res/layout/dialog_view_edittext.xml | 17 + app/src/main/res/layout/fragment_empty.xml | 5 +- .../res/layout/fragment_evaluation_result.xml | 302 +++++++++--------- .../layout/fragment_offline_map_city_list.xml | 2 +- .../main/res/layout/fragment_phenomenon.xml | 108 ++++--- .../main/res/layout/fragment_problem_link.xml | 2 +- .../res/layout/fragment_qs_record_list.xml | 4 +- app/src/main/res/layout/fragment_task.xml | 52 +++ .../main/res/layout/fragment_task_list.xml | 106 +++--- .../main/res/layout/fragment_task_manager.xml | 76 +++++ app/src/main/res/layout/temp.xml | 34 -- app/src/main/res/menu/evaluation_bar_mean.xml | 18 -- .../res/menu/evaluation_list_bar_mean.xml | 25 -- .../main/res/menu/personal_center_menu.xml | 9 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 - .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 - .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 - app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes .../res/navigation/left_drawer_nav_graph.xml | 7 +- .../navigation/middle_fragment_nav_graph.xml | 1 - app/src/main/res/values-w1024dp/dimens.xml | 12 + app/src/main/res/values-w1240dp/dimens.xml | 3 - app/src/main/res/values-w600dp/dimens.xml | 1 + app/src/main/res/values/colors.xml | 297 ++++++++--------- app/src/main/res/values/dimens.xml | 21 +- app/src/main/res/values/strings.xml | 11 - app/src/main/res/values/styles.xml | 110 +++---- .../library/data/entity/HadLinkDvoBean.kt | 7 +- .../library/map/handler/AnimationHandler.kt | 8 + .../library/map/layers/OmdbTaskLinkLayer.kt | 49 ++- .../res/drawable/bg_nimap_default_button.xml | 16 - .../res/drawable/shape_button_default.xml | 13 - .../main/res/drawable/shape_button_press.xml | 13 - .../src/main/res/layout/base_map_layout.xml | 1 + .../main/res/mipmap-hdpi/icon_direction.png | Bin 4823 -> 0 bytes .../main/res/mipmap-hdpi/icon_direction_p.png | Bin 4569 -> 0 bytes .../main/res/mipmap-xxhdpi/map_icon_blue1.png | Bin 2694 -> 0 bytes .../src/main/res/values/colors.xml | 7 - .../src/main/res/values/themes.xml | 13 - 226 files changed, 1789 insertions(+), 1545 deletions(-) create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerAdapter.kt create mode 100644 app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt rename app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/{TaskListViewModel.kt => TaskViewModel.kt} (55%) delete mode 100644 app/src/main/res/color/btn_blue_white.xml delete mode 100644 app/src/main/res/color/font_blue_reg.xml delete mode 100644 app/src/main/res/color/selector_default_text_color_black_enable_white.xml create mode 100644 app/src/main/res/drawable-v24/baseline_edit_note_48.xml create mode 100644 app/src/main/res/drawable-v24/baseline_edit_note_48_select.xml create mode 100644 app/src/main/res/drawable-v24/baseline_keyboard_arrow_down_12.xml delete mode 100644 app/src/main/res/drawable-v24/baseline_my_location_24.xml delete mode 100644 app/src/main/res/drawable-v24/baseline_save_24.xml rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_check_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_format_list_bulleted_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_generating_tokens_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_keyboard_arrow_down_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_keyboard_arrow_left_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_keyboard_arrow_right_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_layers_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_playlist_add_check_24.xml (100%) rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_scatter_plot_24.xml (100%) create mode 100644 app/src/main/res/drawable-v24/ic_baseline_search_24.xml rename app/src/main/res/{drawable => drawable-v24}/ic_baseline_sim_card_download_24.xml (59%) delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml delete mode 100644 app/src/main/res/drawable-xhdpi/icon_2d_3d.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_add_data.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_add_voice.png rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/icon_back_n.png (100%) rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/icon_back_p.png (100%) delete mode 100644 app/src/main/res/drawable-xhdpi/icon_calc_disance.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_camera.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_delete_p.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_location.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_page_video_a1.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_save.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_serach.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_trace.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_voice.png rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/login_bg.png (100%) rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/login_password.png (100%) rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/login_username.png (100%) rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/point_blue.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/bg_sign.png (100%) delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_camera.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_clear.png delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_delete_p.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_fragment_close.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_fragment_switch_off.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_fragment_switch_on.png rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k1.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k10.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k11.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k13.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k15.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k2.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k3.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k4.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k6.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k7.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k8.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_kind_code_k9.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num1.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num10.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num11.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num12.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num2.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num3.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num4.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num5.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num6.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num7.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num8.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_lane_num9.png (100%) create mode 100644 app/src/main/res/drawable-xxhdpi/icon_main_geometry.png rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/icon_road_direction.png (100%) create mode 100644 app/src/main/res/drawable-xxhdpi/icon_task.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_task_select.png delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_voice.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_zoom_in.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_zoom_out.png rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/login_bg.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/login_password.png (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/login_username.png (100%) delete mode 100644 app/src/main/res/drawable/bg_select_sound_xml.xml delete mode 100644 app/src/main/res/drawable/btn_back_xml.xml delete mode 100644 app/src/main/res/drawable/dialog_bg.xml delete mode 100644 app/src/main/res/drawable/dialog_bg_cancel.xml delete mode 100644 app/src/main/res/drawable/dialog_bg_ok.xml delete mode 100644 app/src/main/res/drawable/drawable_bg_tittle_blue_bg_4_radius.xml delete mode 100644 app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml delete mode 100644 app/src/main/res/drawable/fm_card_map_btn_bg_line.xml delete mode 100644 app/src/main/res/drawable/fm_card_map_down_status_bg.xml delete mode 100644 app/src/main/res/drawable/ic_baseline_search_24.xml delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app/src/main/res/drawable/icon_down_arrow.png delete mode 100644 app/src/main/res/drawable/icon_item_high_bg.9.png create mode 100644 app/src/main/res/drawable/icon_map_zoom_in.xml create mode 100644 app/src/main/res/drawable/icon_map_zoom_out.xml delete mode 100644 app/src/main/res/drawable/icon_select_sound_defaule.9.png delete mode 100644 app/src/main/res/drawable/icon_select_sound_press.9.png delete mode 100644 app/src/main/res/drawable/ripple_btn_checked.xml create mode 100644 app/src/main/res/drawable/ripple_fragment_save_botton_bg.xml create mode 100644 app/src/main/res/drawable/selector_adapter_item_select_bg.xml delete mode 100644 app/src/main/res/drawable/selector_bg_video_button.xml delete mode 100644 app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml rename app/src/main/res/drawable/{btn_delete_xml.xml => selector_btn_back_xml.xml} (78%) rename app/src/main/res/drawable/{btn_bg_default.xml => selector_btn_bg_default.xml} (100%) create mode 100644 app/src/main/res/drawable/selector_default_button_white_bg.xml delete mode 100644 app/src/main/res/drawable/selector_default_text_color_white_enable_gray.xml create mode 100644 app/src/main/res/drawable/selector_fragment_switch.xml create mode 100644 app/src/main/res/drawable/selector_road_line_bg.xml delete mode 100644 app/src/main/res/drawable/selector_road_line_btn_bg.xml create mode 100644 app/src/main/res/drawable/selector_task_head.xml create mode 100644 app/src/main/res/drawable/selector_task_link_edit_icon.xml create mode 100644 app/src/main/res/drawable/selector_zoom_in_bg.xml create mode 100644 app/src/main/res/drawable/selector_zoom_out_bg.xml rename app/src/main/res/drawable/{drawable_bg_blue_bg_4_radius.xml => shape_bg_blue_bg_4_radius.xml} (100%) delete mode 100644 app/src/main/res/drawable/shape_btn_check.xml rename app/src/main/res/drawable/{btn_connect_bg_enabled.xml => shape_btn_connect_bg_enabled.xml} (51%) delete mode 100644 app/src/main/res/drawable/shape_btn_normal.xml rename app/src/main/res/drawable/{btn_red_disconnect_bg.xml => shape_btn_red_disconnect_bg.xml} (100%) delete mode 100644 app/src/main/res/drawable/shape_btn_video_press.xml delete mode 100644 app/src/main/res/drawable/shape_card_bg_default.xml delete mode 100644 app/src/main/res/drawable/shape_card_bg_select.xml create mode 100644 app/src/main/res/drawable/shape_default_inputlayout_white_bg.xml rename app/src/main/res/drawable/{icon_speed_limit.xml => shape_icon_speed_limit.xml} (100%) rename app/src/main/res/drawable/{icon_speed_limit_off.xml => shape_icon_speed_limit_off.xml} (100%) rename app/src/main/res/drawable/{drawable_bg_blue_frame_white_bg_4_radius.xml => shape_left_fragment_bg.xml} (53%) rename app/src/main/res/drawable/{login_inputlayout_bg.xml => shape_login_inputlayout_bg.xml} (100%) create mode 100644 app/src/main/res/drawable/shape_middle_fragment_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_blue_6dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_e0dfe3_12dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_white_2dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_white_6dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_white_8dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_rect_white_press_6dp_bg.xml create mode 100644 app/src/main/res/drawable/shape_right_fragment_bg.xml create mode 100644 app/src/main/res/drawable/shape_zoom_in_bg.xml create mode 100644 app/src/main/res/drawable/shape_zoom_in_press_bg.xml create mode 100644 app/src/main/res/drawable/shape_zoom_out_bg.xml create mode 100644 app/src/main/res/drawable/shape_zoom_out_press_bg.xml create mode 100644 app/src/main/res/layout/adapter_task.xml delete mode 100644 app/src/main/res/layout/cv_map_top_right_menu.xml create mode 100644 app/src/main/res/layout/dialog_view_edittext.xml create mode 100644 app/src/main/res/layout/fragment_task.xml create mode 100644 app/src/main/res/layout/fragment_task_manager.xml delete mode 100644 app/src/main/res/layout/temp.xml delete mode 100644 app/src/main/res/menu/evaluation_bar_mean.xml delete mode 100644 app/src/main/res/menu/evaluation_list_bar_mean.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values-w1024dp/dimens.xml delete mode 100644 app/src/main/res/values-w1240dp/dimens.xml delete mode 100644 collect-library/src/main/res/drawable/bg_nimap_default_button.xml delete mode 100644 collect-library/src/main/res/drawable/shape_button_default.xml delete mode 100644 collect-library/src/main/res/drawable/shape_button_press.xml delete mode 100644 collect-library/src/main/res/mipmap-hdpi/icon_direction.png delete mode 100644 collect-library/src/main/res/mipmap-hdpi/icon_direction_p.png delete mode 100644 collect-library/src/main/res/mipmap-xxhdpi/map_icon_blue1.png diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index afdec6e8..e21becca 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -39,6 +39,8 @@ class MainActivity : BaseActivity() { private lateinit var binding: ActivityMainBinding private val viewModel by viewModels() + var switchFragment = false + //注入地图控制器 @Inject lateinit var mapController: NIMapController @@ -115,9 +117,9 @@ class MainActivity : BaseActivity() { viewModel.liveDataMenuState.observe(this) { binding.mainActivityMenu.isSelected = it if (it == true) { - binding.mainActivityMenuLayout.visibility = View.VISIBLE + binding.mainActivityMenuGroup.visibility = View.VISIBLE } else { - binding.mainActivityMenuLayout.visibility = View.GONE + binding.mainActivityMenuGroup.visibility = View.INVISIBLE } } @@ -225,6 +227,32 @@ class MainActivity : BaseActivity() { } + /** + * zoomin + */ + fun zoomInOnclick(view: View) { + mapController.animationHandler.zoomIn() + } + + /** + * zoomOut + */ + fun zoomOutOnclick(view: View) { + mapController.animationHandler.zoomOut() + } + + /** + * + */ + fun onSwitchFragment() { + switchFragment = !switchFragment + binding.mainActivityFragmentSwitch.isSelected = switchFragment + if (switchFragment) { + binding.mainActivityFragmentGroup.visibility = View.GONE + } else { + binding.mainActivityFragmentGroup.visibility = View.VISIBLE + } + } /** * 点击录音按钮 diff --git a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java index 44a7f960..4cac5dc0 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java +++ b/app/src/main/java/com/navinfo/omqs/ui/dialog/CommonDialog.java @@ -34,7 +34,6 @@ import com.navinfo.collect.library.sensor.ISensor.enmConnectionStatus; import com.navinfo.collect.library.sensor.ISensor.SensorWorkingMode; import com.navinfo.collect.library.garminvirbxe.SensorParams; import com.navinfo.collect.library.garminvirbxe.HostBean; -import com.navinfo.collect.library.system.VLCApplication; import com.navinfo.omqs.Constant; import com.navinfo.omqs.R; import com.navinfo.omqs.ui.activity.map.MainActivity; @@ -295,7 +294,7 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid mOneBtConnect.setPressed(false); mOneBtConnect.setText("一键连接"); mStartOrEndTakePicture.setEnabled(false); - mOneBtConnect.setBackgroundResource(R.drawable.btn_connect_bg_enabled); + mOneBtConnect.setBackgroundResource(R.drawable.shape_btn_connect_bg_enabled); updateCameraResources(1, getmDeviceNum()); Log.e("AAA", "未知返回"); @@ -485,7 +484,7 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid mShareUtil.setConnectstate(Constant.USER_ID, connectstate); stopVideo(); mOneBtConnect.setPressed(true); - mOneBtConnect.setBackgroundResource(R.drawable.btn_red_disconnect_bg); + mOneBtConnect.setBackgroundResource(R.drawable.shape_btn_red_disconnect_bg); mOneBtConnect.setText("断开连接！"); //停止获取GPS状态 if (getmDeviceNum() == 1) @@ -679,7 +678,7 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid if (connectstate) { mOneBtConnect.setPressed(true); - mOneBtConnect.setBackgroundResource(R.drawable.btn_red_disconnect_bg); + mOneBtConnect.setBackgroundResource(R.drawable.shape_btn_red_disconnect_bg); mOneBtConnect.setText("断开连接！"); @@ -857,7 +856,7 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid //停止当前活动 takephotoManager.StopContinuousTakePhoto(mHostBean, getmDeviceNum()); - mOneBtConnect.setBackgroundResource(R.drawable.btn_connect_bg_enabled); + mOneBtConnect.setBackgroundResource(R.drawable.shape_btn_connect_bg_enabled); mOneBtConnect.setText("一键连接！"); @@ -1076,7 +1075,7 @@ public class CommonDialog extends Dialog implements SurfaceHolder.Callback, IVid connectstate = false; mShareUtil.setConnectstate(Constant.USER_ID, connectstate); mOneBtConnect.setPressed(false); - mOneBtConnect.setBackgroundResource(R.drawable.btn_connect_bg_enabled); + mOneBtConnect.setBackgroundResource(R.drawable.shape_btn_connect_bg_enabled); mOneBtConnect.setText("一键连接"); //增加按钮状态控制 mStartOrEndTakePicture.setEnabled(false); diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt index f01bcb63..919b088b 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt @@ -23,6 +23,10 @@ import androidx.navigation.findNavController @AndroidEntryPoint class EvaluationResultFragment : BaseFragment(), View.OnClickListener { private lateinit var binding: FragmentEvaluationResultBinding + + /** + * 和[PhenomenonFragment],[ProblemLinkFragment],[EvaluationResultFragment]共用同一个viewModel + */ private val viewModel by shareViewModels("QsRecode") // private val args:EmptyFragmentArgs by navArgs() diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt index 586b7b68..4b30dd25 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt @@ -29,10 +29,10 @@ class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) : val title = data[position] bd.itemId.text = title if (selectTitle == title) { - bd.itemId.setBackgroundResource(R.drawable.drawable_bg_tittle_blue_bg_4_radius) + bd.itemId.setBackgroundResource(R.drawable.shape_rect_white_2dp_bg) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.highFontColor)) } else { - bd.itemId.setBackgroundResource(R.drawable.drawable_bg_white_bg_4_radius) + bd.itemId.setBackgroundResource(R.drawable.shape_rect_white_2dp_bg) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.black)) } bd.root.setOnClickListener { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt index 43602e5d..e2ce025f 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/MiddleAdapter.kt @@ -32,10 +32,10 @@ class MiddleAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) layoutParams.width = 115 bd.itemLayout.layoutParams = layoutParams if (selectTitle == title) { - bd.itemId.setBackgroundResource(R.drawable.drawable_bg_blue_bg_4_radius) + bd.itemId.setBackgroundResource(R.drawable.shape_bg_blue_bg_4_radius) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.white)) } else { - bd.itemId.setBackgroundResource(R.drawable.drawable_bg_white_bg_4_radius) + bd.itemId.setBackgroundResource(R.drawable.shape_rect_white_2dp_bg) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.black)) } bd.root.setOnClickListener { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt index c755ed89..4958f2e0 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt @@ -19,6 +19,9 @@ class PhenomenonFragment : BaseFragment() { private var _binding: FragmentPhenomenonBinding? = null private val binding get() = _binding!! + /** + * 和[PhenomenonFragment],[ProblemLinkFragment],[EvaluationResultFragment]共用同一个viewModel + */ private val viewModel: EvaluationResultViewModel by shareViewModels("QsRecode") override fun onCreateView( @@ -112,14 +115,14 @@ class PhenomenonFragment : viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { middleAdapter.refreshData(it) } - binding.phenomenonDrawer.setOnClickListener { - when (binding.group.visibility) { - View.INVISIBLE, View.GONE -> - binding.group.visibility = View.VISIBLE - else -> - binding.group.visibility = View.GONE - } - } +// binding.phenomenonDrawer.setOnClickListener { +// when (binding.group.visibility) { +// View.INVISIBLE, View.GONE -> +// binding.group.visibility = View.VISIBLE +// else -> +// binding.group.visibility = View.GONE +// } +// } viewModel.getClassTypeList() } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt index 26286848..0bdc6225 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt @@ -1,5 +1,6 @@ package com.navinfo.omqs.ui.fragment.evaluationresult +import android.os.Build import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -14,6 +15,11 @@ import com.navinfo.omqs.ui.other.shareViewModels class ProblemLinkFragment : BaseFragment() { private var _binding: FragmentProblemLinkBinding? = null private val binding get() = _binding!! + + /** + * 和[PhenomenonFragment],[ProblemLinkFragment],[EvaluationResultFragment]共用同一个viewModel + */ + private val viewModel: EvaluationResultViewModel by shareViewModels("QsRecode") override fun onCreateView( @@ -40,11 +46,13 @@ class ProblemLinkFragment : BaseFragment() { } binding.linkRightRecyclerview.adapter = rightAdapter //右侧菜单增加组标题 - binding.linkRightRecyclerview.addItemDecoration( - RightGroupHeaderDecoration( - requireContext() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + binding.linkRightRecyclerview.addItemDecoration( + RightGroupHeaderDecoration( + requireContext() + ) ) - ) + } //右侧菜单查询数据监听 viewModel.liveDataRightTypeList.observe(viewLifecycleOwner) { rightAdapter.refreshData(it) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 571b6024..b0d14d37 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -114,7 +114,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks { .animateTo(GeoPoint(40.1012346774074730, 116.25571303257621)) } R.id.personal_center_menu_task_list -> { - findNavController().navigate(R.id.TaskListFragment) + findNavController().navigate(R.id.TaskManagerFragment) } R.id.personal_center_menu_qs_record_list -> { findNavController().navigate(R.id.QsRecordListFragment) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt new file mode 100644 index 00000000..86503718 --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskAdapter.kt @@ -0,0 +1,70 @@ +package com.navinfo.omqs.ui.fragment.tasklist + +import android.view.LayoutInflater +import android.view.ViewGroup +import com.navinfo.collect.library.data.entity.HadLinkDvoBean +import com.navinfo.omqs.R +import com.navinfo.omqs.databinding.AdapterTaskBinding +import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter +import com.navinfo.omqs.ui.other.BaseViewHolder + + +interface TaskAdapterCallback { + fun itemOnClick(bean: HadLinkDvoBean) + fun editOnclick(position: Int, bean: HadLinkDvoBean) +} + +/** + * 当前任务适配器 + */ +class TaskAdapter( + private val callback: TaskAdapterCallback +) : BaseRecyclerViewAdapter() { + private var selectPosition = -1 + + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder { + val viewBinding = + AdapterTaskBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return BaseViewHolder(viewBinding) + } + + override fun onViewRecycled(holder: BaseViewHolder) { + super.onViewRecycled(holder) + } + + override fun onBindViewHolder(holder: BaseViewHolder, position: Int) { + val binding: AdapterTaskBinding = + holder.viewBinding as AdapterTaskBinding + val bean = data[position] + binding.taskLinkPid.text = "PID:${bean.linkPid}" + binding.taskMesh.text = "mesh:${bean.mesh}" + binding.root.isSelected = selectPosition == position + binding.root.setOnClickListener { + val pos = holder.adapterPosition + if (selectPosition != pos) { + val lastPos = selectPosition + selectPosition = pos + if (lastPos > -1 && lastPos < itemCount) { + notifyItemChanged(lastPos) + } + binding.root.isSelected = true + callback.itemOnClick(bean) + } + } + binding.taskEdit.isSelected = bean.reason != "" + binding.taskEdit.setOnClickListener { + callback.editOnclick(position, bean) + } + } + + override fun getItemViewRes(position: Int): Int { + return R.layout.adapter_task + } + + fun resetSelect() { + selectPosition = -1 + } +} + + diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt new file mode 100644 index 00000000..6461c8fb --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskFragment.kt @@ -0,0 +1,104 @@ +package com.navinfo.omqs.ui.fragment.tasklist + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.EditText +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.navinfo.collect.library.data.entity.HadLinkDvoBean +import com.navinfo.omqs.R +import com.navinfo.omqs.databinding.FragmentTaskBinding +import com.navinfo.omqs.databinding.FragmentTaskListBinding +import com.navinfo.omqs.http.taskdownload.TaskDownloadManager +import com.navinfo.omqs.http.taskupload.TaskUploadManager +import com.navinfo.omqs.ui.fragment.BaseFragment +import com.navinfo.omqs.ui.other.shareViewModels +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.launch +import javax.inject.Inject + +/** + * 当前任务的道路列表 + */ +@AndroidEntryPoint +class TaskFragment : BaseFragment() { + + private var _binding: FragmentTaskBinding? = null + + /** + * 和[TaskManagerFragment],[TaskListFragment],[TaskFragment]共用同一个viewModel + */ + private val viewModel by shareViewModels("Task") + private val binding get() = _binding!! + private val adapter: TaskAdapter by lazy { + TaskAdapter(object : TaskAdapterCallback { + override fun itemOnClick(bean: HadLinkDvoBean) { + viewModel.showCurrentLink(bean) + } + + override fun editOnclick(position: Int, bean: HadLinkDvoBean) { + showLinkEditDialog(position, bean) + } + }) + } + + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = FragmentTaskBinding.inflate(inflater, container, false) + return binding.root + + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + val layoutManager = LinearLayoutManager(context) + //// 设置 RecyclerView 的固定大小，避免在滚动时重新计算视图大小和布局，提高性能 + binding.taskRecyclerview.setHasFixedSize(true) + binding.taskRecyclerview.layoutManager = layoutManager + binding.taskRecyclerview.adapter = adapter + viewModel.liveDataTaskLinks.observe(viewLifecycleOwner) { + adapter.resetSelect() + adapter.refreshData(it) + } + viewModel.getTaskList(requireContext()) + + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + /** + * 显示link编辑dialog + */ + private fun showLinkEditDialog(position: Int, bean: HadLinkDvoBean) { + val view = this.layoutInflater.inflate(R.layout.dialog_view_edittext, null) + val inputDialog = MaterialAlertDialogBuilder( + requireContext() + ).setTitle("标记原因").setView(view) + var editText = view.findViewById(R.id.dialog_edittext) + editText.setText(bean.reason) + inputDialog.setNegativeButton("取消") { dialog, _ -> + dialog.dismiss() + } + inputDialog.setPositiveButton("确定") { dialog, _ -> + lifecycleScope.launch { + val text = editText.text.toString() + viewModel.saveLinkReason(bean, text) + adapter.notifyItemChanged(position) + dialog.dismiss() + } + + } + inputDialog.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt index 6b25c3f2..08e21371 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt @@ -5,8 +5,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.lifecycle.Observer -import com.navinfo.omqs.R import com.navinfo.collect.library.data.entity.TaskBean +import com.navinfo.omqs.R import com.navinfo.omqs.databinding.AdapterTaskListBinding import com.navinfo.omqs.http.taskdownload.TaskDownloadManager import com.navinfo.omqs.http.taskupload.TaskUploadManager @@ -25,11 +25,13 @@ import com.navinfo.omqs.ui.other.BaseViewHolder */ class TaskListAdapter( private val downloadManager: TaskDownloadManager, - private val uploadManager: TaskUploadManager + private val uploadManager: TaskUploadManager, + private var itemListener: ((Int, TaskBean) -> Unit?)? = null ) : BaseRecyclerViewAdapter() { + private var selectPosition = -1 - - private val downloadBtnClick = View.OnClickListener() { + private + val downloadBtnClick = View.OnClickListener() { if (it.tag != null) { val taskBean = data[it.tag as Int] when (taskBean.status) { @@ -53,7 +55,7 @@ class TaskListAdapter( val taskBean = data[it.tag as Int] Log.e("jingo", "开始上传 ${taskBean.syncStatus}") when (taskBean.syncStatus) { - FileUploadStatus.NONE, FileUploadStatus.ERROR,FileUploadStatus.WAITING -> { + FileUploadStatus.NONE, FileUploadStatus.ERROR, FileUploadStatus.WAITING -> { uploadManager.start(taskBean.id) } } @@ -80,7 +82,7 @@ class TaskListAdapter( holder.tag = taskBean.id.toString() changeViews(binding, taskBean) downloadManager.addTask(taskBean) - downloadManager.observer(taskBean.id, holder, DownloadObserver(taskBean.id, binding)) + downloadManager.observer(taskBean.id, holder, DownloadObserver(taskBean.id, holder)) uploadManager.addTask(taskBean) uploadManager.observer(taskBean.id, holder, UploadObserver(taskBean.id, binding)) binding.taskDownloadBtn.tag = position @@ -91,14 +93,32 @@ class TaskListAdapter( binding.taskCityName.text = taskBean.cityName binding.taskDataVersion.text = "版本号：${taskBean.dataVersion}" binding.taskColor.setTextColor(taskBean.color) -// binding.offlineMapCitySize.text = cityBean.getFileSizeText() + binding.root.isSelected = selectPosition == position + binding.root.setOnClickListener { + val pos = holder.adapterPosition + if (selectPosition != pos) { + val lastPos = selectPosition + selectPosition = pos + if (lastPos > -1) { + notifyItemChanged(lastPos) + } + binding.root.isSelected = true + itemListener?.invoke(position, taskBean) + } + + } } - inner class DownloadObserver(val id: Int, val binding: AdapterTaskListBinding) : + inner class DownloadObserver(val id: Int, val holder: BaseViewHolder) : Observer { - override fun onChanged(t: TaskBean?) { - if (id == t?.id) - changeViews(binding, t) + override fun onChanged(taskBean: TaskBean?) { + taskBean?.let { bean -> + if (id.toString() == holder.tag) { + val binding: AdapterTaskListBinding = + holder.viewBinding as AdapterTaskListBinding + changeViews(binding, bean) + } + } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt index b93c7bb6..d6c6e697 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt @@ -11,22 +11,31 @@ import com.navinfo.omqs.databinding.FragmentTaskListBinding import com.navinfo.omqs.http.taskdownload.TaskDownloadManager import com.navinfo.omqs.http.taskupload.TaskUploadManager import com.navinfo.omqs.ui.fragment.BaseFragment +import com.navinfo.omqs.ui.other.shareViewModels import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject @AndroidEntryPoint -class TaskListFragment : BaseFragment(){ +class TaskListFragment : BaseFragment() { + @Inject lateinit var downloadManager: TaskDownloadManager + @Inject lateinit var uploadManager: TaskUploadManager private var _binding: FragmentTaskListBinding? = null - private val viewModel by viewModels() + + /** + * 和[TaskManagerFragment],[TaskListFragment],[TaskFragment]共用同一个viewModel + */ + private val viewModel by shareViewModels("Task") private val binding get() = _binding!! private val adapter: TaskListAdapter by lazy { TaskListAdapter( - downloadManager,uploadManager - ) + downloadManager, uploadManager + ) { position, taskBean -> + viewModel.setSelectTaskBean(taskBean) + } } override fun onCreateView( @@ -44,16 +53,13 @@ class TaskListFragment : BaseFragment(){ super.onViewCreated(view, savedInstanceState) val layoutManager = LinearLayoutManager(context) //// 设置 RecyclerView 的固定大小，避免在滚动时重新计算视图大小和布局，提高性能 - binding.taskRecyclerview.setHasFixedSize(true) - binding.taskRecyclerview.layoutManager = layoutManager - binding.taskRecyclerview.adapter = adapter + binding.taskListRecyclerview.setHasFixedSize(true) + binding.taskListRecyclerview.layoutManager = layoutManager + binding.taskListRecyclerview.adapter = adapter viewModel.liveDataTaskList.observe(viewLifecycleOwner) { adapter.refreshData(it) } - viewModel.getTaskList(requireContext()) - binding.taskBack.setOnClickListener{ - findNavController().navigateUp() - } + } override fun onDestroyView() { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerAdapter.kt new file mode 100644 index 00000000..bbe2e0bd --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerAdapter.kt @@ -0,0 +1,25 @@ +package com.navinfo.omqs.ui.fragment.tasklist + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter + +/** + * 离线地图主页面，viewpage适配器 + */ +class TaskManagerAdapter(activity: FragmentActivity) : + FragmentStateAdapter(activity) { + private val taskListFragment = TaskListFragment() + private val taskFragment = TaskFragment() + override fun getItemCount(): Int { + return 2 + } + + override fun createFragment(position: Int): Fragment { + return when (position) { + 0 -> taskFragment + else -> + taskListFragment + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt new file mode 100644 index 00000000..8c74cdfc --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskManagerFragment.kt @@ -0,0 +1,64 @@ +package com.navinfo.omqs.ui.fragment.tasklist + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.navigation.fragment.findNavController +import com.google.android.material.tabs.TabLayoutMediator +import com.navinfo.omqs.databinding.FragmentTaskManagerBinding +import com.navinfo.omqs.ui.fragment.BaseFragment +import com.navinfo.omqs.ui.other.shareViewModels +import dagger.hilt.android.AndroidEntryPoint + +/** + * 评测任务viewpager管理页面 + */ +@AndroidEntryPoint +class TaskManagerFragment : BaseFragment() { + private var _binding: FragmentTaskManagerBinding? = null + + private val binding get() = _binding!! + + /** + * 和[TaskManagerFragment],[TaskListFragment],[TaskFragment]共用同一个viewModel + */ + private val viewModel by shareViewModels("Task") + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = FragmentTaskManagerBinding.inflate(inflater, container, false) + return binding.root + + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + //禁止滑动，因为页面在抽屉里，和抽屉的滑动有冲突 + binding.taskManagerViewpager.isUserInputEnabled = false + //创建viewpager2的适配器 + binding.taskManagerViewpager.adapter = activity?.let { TaskManagerAdapter(it) } + //绑定viewpager2与tabLayout + TabLayoutMediator( + binding.taskManagerTabLayout, + binding.taskManagerViewpager + ) { tab, position -> + when (position) { + 0 -> tab.text = "当前任务" + 1 -> tab.text = "任务列表" + } + }.attach() + viewModel.getTaskList(requireContext()) + binding.taskBack.setOnClickListener { + findNavController().navigateUp() + } + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt similarity index 55% rename from app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt rename to app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt index 7f2c178d..6ea1334c 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt @@ -3,14 +3,15 @@ package com.navinfo.omqs.ui.fragment.tasklist import android.content.Context import android.graphics.Color import android.os.Build -import android.util.Log import android.widget.Toast import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.navinfo.collect.library.map.NIMapController -import com.navinfo.omqs.Constant +import com.navinfo.collect.library.data.entity.HadLinkDvoBean import com.navinfo.collect.library.data.entity.TaskBean +import com.navinfo.collect.library.map.NIMapController +import com.navinfo.collect.library.utils.GeometryTools +import com.navinfo.omqs.Constant import com.navinfo.omqs.http.NetResult import com.navinfo.omqs.http.NetworkService import com.navinfo.omqs.tools.FileManager @@ -24,16 +25,29 @@ import javax.inject.Inject @HiltViewModel -class TaskListViewModel @Inject constructor( +class TaskViewModel @Inject constructor( private val networkService: NetworkService, private val mapController: NIMapController ) : ViewModel() { + /** + * 用来更新任务列表 + */ val liveDataTaskList = MutableLiveData>() - val colors = + /** + * 用来更新当前任务 + */ + val liveDataTaskLinks = MutableLiveData>() + private val colors = arrayOf(Color.RED, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.GREEN, Color.CYAN) + /** + * 当前选中的任务 + */ + private var currentSelectTaskBean: TaskBean? = null + + /** * 下载任务列表 */ @@ -54,7 +68,6 @@ class TaskListViewModel @Inject constructor( ).findFirst() if (item != null) { task.fileSize = item.fileSize - Log.e("jingo", "当前文件大小 ${task.fileSize}") task.status = item.status task.currentSize = item.currentSize task.color = item.color @@ -106,12 +119,94 @@ class TaskListViewModel @Inject constructor( // } // niMapController.lineHandler.omdbTaskLinkLayer.update() liveDataTaskList.postValue(taskList) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - mapController.lineHandler.omdbTaskLinkLayer.removeAll() - for (item in taskList) { - mapController.lineHandler.omdbTaskLinkLayer.setLineColor(Color.valueOf(item.color)) - mapController.lineHandler.omdbTaskLinkLayer.addLineList(item.hadLinkDvoList) +// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { +// mapController.lineHandler.omdbTaskLinkLayer.removeAll() +// if(taskList.isNotEmpty()){ +// mapController.lineHandler.omdbTaskLinkLayer.addLineList(item.hadLinkDvoList) +// } +// for (item in taskList) { +// mapController.lineHandler.omdbTaskLinkLayer.setLineColor(Color.valueOf(item.color)) +// +// } +// } + } + } + + /** + * 设置当前选择的任务，并高亮当前任务的所有link + */ + fun setSelectTaskBean(taskBean: TaskBean) { + currentSelectTaskBean = taskBean + liveDataTaskLinks.value = taskBean.hadLinkDvoList + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + mapController.lineHandler.omdbTaskLinkLayer.removeAll() + mapController.lineHandler.omdbTaskLinkLayer.addLineList(taskBean.hadLinkDvoList) + var maxX = 0.0 + var maxY = 0.0 + var minX = 0.0 + var minY = 0.0 + for (item in taskBean.hadLinkDvoList) { + val geometry = GeometryTools.createGeometry(item.geometry) + val envelope = geometry.envelopeInternal + if (envelope.maxX > maxX) { + maxX = envelope.maxX } + if (envelope.maxY > maxY) { + maxY = envelope.maxY + } + if (envelope.minX < minX || minX == 0.0) { + minX = envelope.minX + } + if (envelope.minY < minY || minY == 0.0) { + minY = envelope.minY + } + } + mapController.animationHandler.animateToBox( + maxX = maxX, + maxY = maxY, + minX = minX, + minY = minY + ) + } + } + + /** + * 高亮当前选中的link + */ + fun showCurrentLink(link: HadLinkDvoBean) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + mapController.lineHandler.omdbTaskLinkLayer.showSelectLine(link) + val geometry = GeometryTools.createGeometry(link.geometry) + val envelope = geometry.envelopeInternal + mapController.animationHandler.animateToBox( + maxX = envelope.maxX, + maxY = envelope.maxY, + minX = envelope.minX, + minY = envelope.minY + ) + } + } + + override fun onCleared() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + mapController.lineHandler.omdbTaskLinkLayer.clearSelectLine() + } + super.onCleared() + } + + + suspend fun saveLinkReason(bean: HadLinkDvoBean, text: String) { + withContext(Dispatchers.IO) { + currentSelectTaskBean?.let { + for (item in it.hadLinkDvoList) { + if (item.linkPid == bean.linkPid) { + item.reason = text + } + } + } + val realm = Realm.getDefaultInstance() + realm.executeTransaction { + realm.copyToRealmOrUpdate(currentSelectTaskBean) } } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt index c575d0ca..5be587b3 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt @@ -63,13 +63,13 @@ class SignUtil { try { //限速标志 0 限速开始 1 限速解除 return when (data.properties["speed_flag"]) { - "1" -> return R.drawable.icon_speed_limit_off - else -> return R.drawable.icon_speed_limit + "1" -> return R.drawable.shape_icon_speed_limit_off + else -> return R.drawable.shape_icon_speed_limit } } catch (e: Exception) { Log.e("jingo", "获取限速面板ICON出错2 $e") } - return R.drawable.icon_speed_limit + return R.drawable.shape_icon_speed_limit } /** @@ -86,7 +86,7 @@ class SignUtil { 2041 -> getLaneNumIcon(data) //限速 4002 -> getSpeedLimitIcon(data) - else -> R.drawable.icon_speed_limit + else -> R.drawable.shape_icon_speed_limit } } @@ -99,24 +99,24 @@ class SignUtil { try { val kind = data.properties["kind"] return when (kind!!.toInt()) { - 1 -> R.mipmap.icon_kind_code_k1 - 2 -> R.mipmap.icon_kind_code_k2 - 3 -> R.mipmap.icon_kind_code_k3 - 4 -> R.mipmap.icon_kind_code_k4 - 6 -> R.mipmap.icon_kind_code_k6 - 7 -> R.mipmap.icon_kind_code_k7 - 8 -> R.mipmap.icon_kind_code_k8 - 9 -> R.mipmap.icon_kind_code_k9 - 10 -> R.mipmap.icon_kind_code_k10 - 11 -> R.mipmap.icon_kind_code_k11 - 13 -> R.mipmap.icon_kind_code_k13 - 15 -> R.mipmap.icon_kind_code_k15 - else -> R.mipmap.icon_kind_code + 1 -> R.drawable.icon_kind_code_k1 + 2 -> R.drawable.icon_kind_code_k2 + 3 -> R.drawable.icon_kind_code_k3 + 4 -> R.drawable.icon_kind_code_k4 + 6 -> R.drawable.icon_kind_code_k6 + 7 -> R.drawable.icon_kind_code_k7 + 8 -> R.drawable.icon_kind_code_k8 + 9 -> R.drawable.icon_kind_code_k9 + 10 -> R.drawable.icon_kind_code_k10 + 11 -> R.drawable.icon_kind_code_k11 + 13 -> R.drawable.icon_kind_code_k13 + 15 -> R.drawable.icon_kind_code_k15 + else -> R.drawable.icon_kind_code } } catch (e: Exception) { Log.e("jingo", "获取种别面板ICON出错 $e") } - return R.mipmap.icon_kind_code + return R.drawable.icon_kind_code } /** @@ -126,41 +126,41 @@ class SignUtil { try { val lineNum = data.properties["laneNum"] return when (lineNum!!.toInt()) { - 1 -> R.mipmap.icon_lane_num1 - 2 -> R.mipmap.icon_lane_num2 - 3 -> R.mipmap.icon_lane_num3 - 4 -> R.mipmap.icon_lane_num4 - 5 -> R.mipmap.icon_lane_num5 - 6 -> R.mipmap.icon_lane_num6 - 7 -> R.mipmap.icon_lane_num7 - 8 -> R.mipmap.icon_lane_num8 - 9 -> R.mipmap.icon_lane_num9 - 10 -> R.mipmap.icon_lane_num10 - 11 -> R.mipmap.icon_lane_num11 - 12 -> R.mipmap.icon_lane_num12 - else -> R.mipmap.icon_lane_num1 + 1 -> R.drawable.icon_lane_num1 + 2 -> R.drawable.icon_lane_num2 + 3 -> R.drawable.icon_lane_num3 + 4 -> R.drawable.icon_lane_num4 + 5 -> R.drawable.icon_lane_num5 + 6 -> R.drawable.icon_lane_num6 + 7 -> R.drawable.icon_lane_num7 + 8 -> R.drawable.icon_lane_num8 + 9 -> R.drawable.icon_lane_num9 + 10 -> R.drawable.icon_lane_num10 + 11 -> R.drawable.icon_lane_num11 + 12 -> R.drawable.icon_lane_num12 + else -> R.drawable.icon_lane_num1 } } catch (e: Exception) { Log.e("jingo", "获取车道数面板ICON出错 $e") } - return R.mipmap.icon_road_direction + return R.drawable.icon_road_direction } fun getRoadDirection(data: RenderEntity): Int { try { val direct = data.properties["direct"] return when (direct!!.toInt()) { - 0 -> R.mipmap.icon_road_direction - 1 -> R.mipmap.icon_road_direction - 2 -> R.mipmap.icon_road_direction - 3 -> R.mipmap.icon_road_direction - -99 -> R.mipmap.icon_road_direction - else -> R.mipmap.icon_road_direction + 0 -> R.drawable.icon_road_direction + 1 -> R.drawable.icon_road_direction + 2 -> R.drawable.icon_road_direction + 3 -> R.drawable.icon_road_direction + -99 -> R.drawable.icon_road_direction + else -> R.drawable.icon_road_direction } } catch (e: Exception) { Log.e("jingo", "获取道路方向面板ICON出错 $e") } - return R.mipmap.icon_road_direction + return R.drawable.icon_road_direction } } } \ No newline at end of file diff --git a/app/src/main/res/color/btn_blue_white.xml b/app/src/main/res/color/btn_blue_white.xml deleted file mode 100644 index b8464420..00000000 --- a/app/src/main/res/color/btn_blue_white.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/color/font_blue_reg.xml b/app/src/main/res/color/font_blue_reg.xml deleted file mode 100644 index 99b71983..00000000 --- a/app/src/main/res/color/font_blue_reg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/color/selector_default_text_color_black_enable_white.xml b/app/src/main/res/color/selector_default_text_color_black_enable_white.xml deleted file mode 100644 index 9efaa342..00000000 --- a/app/src/main/res/color/selector_default_text_color_black_enable_white.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/baseline_delete_forever_24.xml b/app/src/main/res/drawable-v24/baseline_delete_forever_24.xml index 32fc924a..893db1df 100644 --- a/app/src/main/res/drawable-v24/baseline_delete_forever_24.xml +++ b/app/src/main/res/drawable-v24/baseline_delete_forever_24.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable-v24/baseline_edit_note_48.xml b/app/src/main/res/drawable-v24/baseline_edit_note_48.xml new file mode 100644 index 00000000..e3023098 --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_edit_note_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable-v24/baseline_edit_note_48_select.xml b/app/src/main/res/drawable-v24/baseline_edit_note_48_select.xml new file mode 100644 index 00000000..04b03748 --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_edit_note_48_select.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable-v24/baseline_keyboard_arrow_down_12.xml b/app/src/main/res/drawable-v24/baseline_keyboard_arrow_down_12.xml new file mode 100644 index 00000000..2806f919 --- /dev/null +++ b/app/src/main/res/drawable-v24/baseline_keyboard_arrow_down_12.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable-v24/baseline_my_location_24.xml b/app/src/main/res/drawable-v24/baseline_my_location_24.xml deleted file mode 100644 index 5747dc82..00000000 --- a/app/src/main/res/drawable-v24/baseline_my_location_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v24/baseline_save_24.xml b/app/src/main/res/drawable-v24/baseline_save_24.xml deleted file mode 100644 index d4ab6604..00000000 --- a/app/src/main/res/drawable-v24/baseline_save_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_check_24.xml b/app/src/main/res/drawable-v24/ic_baseline_check_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_check_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_check_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml b/app/src/main/res/drawable-v24/ic_baseline_format_list_bulleted_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_format_list_bulleted_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml b/app/src/main/res/drawable-v24/ic_baseline_generating_tokens_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_generating_tokens_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml b/app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_down_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_down_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml b/app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_left_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_keyboard_arrow_left_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_left_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml b/app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_right_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_keyboard_arrow_right_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_keyboard_arrow_right_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_layers_24.xml b/app/src/main/res/drawable-v24/ic_baseline_layers_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_layers_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_layers_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml b/app/src/main/res/drawable-v24/ic_baseline_playlist_add_check_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_playlist_add_check_24.xml diff --git a/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml b/app/src/main/res/drawable-v24/ic_baseline_scatter_plot_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_scatter_plot_24.xml diff --git a/app/src/main/res/drawable-v24/ic_baseline_search_24.xml b/app/src/main/res/drawable-v24/ic_baseline_search_24.xml new file mode 100644 index 00000000..2abcc4f1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_baseline_search_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml b/app/src/main/res/drawable-v24/ic_baseline_sim_card_download_24.xml similarity index 59% rename from app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml rename to app/src/main/res/drawable-v24/ic_baseline_sim_card_download_24.xml index 9e5481d6..d9821700 100644 --- a/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml +++ b/app/src/main/res/drawable-v24/ic_baseline_sim_card_download_24.xml @@ -1,5 +1,19 @@ - + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d11..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/icon_2d_3d.png b/app/src/main/res/drawable-xhdpi/icon_2d_3d.png deleted file mode 100644 index 9c70cab255387c2a5a569906c6d2913bf2fa57dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7259 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%0AwoC%EI>=fMlW4r!r&% zkf}&33*T!1l7&j2%8(5}rXsB@e6ImW7Ak!zLpA`JinOxuy#^pzsPw4}*#KlJ(#pd3 z8h~V>(x)LFu?On|g^#xDBGHQP6N!y(lk45~^|k=o<;t0nGg)#U^MoPq$`)2)t&s+IcSwF)zhqZ)Ob^^xd01tIe76BeX0ehCNI)8nIf8|1{-ScV zC)A=UAJy=^07x_Qu2fiwHBTDc?UwvDhXCY`|6Njj$N~0^62tzPC8F%^4d>{1Z(H!( zZ#8thl>j8D_JlmD@{yOjT(z@hK^j?I>naA+p{<}rN(MwRmr2)OVq1E2jpL89#177G zm1NfFRh75B_}1|0*RBuj@J2dS&4OrvEFY**fhIInzt7Q7A9pR&b}@~t0rhBY1rva@ z=ShK5nR)xHl8p_SKEI~WaqY#$kC8{eKEybq;}Y&ygX19qxeGrQZKd?$FJ#H5C9DgIv~xg$K{er+-}LM zDB=(q#bT8<-c<3~1In#`%PbLPcW<`t41Mw3YyB^H!(Cbi<1JEqT$I7MRf<0ZAR`$J z$!f-cG%>f^B>)Ngtjy)4Ky|sKm`&2sr4j2Nu3Oy37{>m#p6u4uoR41R=so*KTUYJe ziBLdNVvb;&>h`%*i!;PEK-|2#x^AX`(6|z*ZUZn9hXe*{*sx=VRMcmc0ybH)!)tnC zUHQq2ODr21L+Us6%(-~7zQM4&KlYuIFZuY<0F;>Q>Ec6Wxv?C7rD`t#Up|0%{6Vf^ z;u?ssE0c&*`bU}M8>w^XFN8J|@;Vok37XP1_2w8&VK^(vZ20Ysv_`QASb zUU1L7eS==7Rv_#1det14OSKmS`JMr){xytacX~2FQmjZ_E4i6EMg=oZd!FQS+C;%D ztp{VK&gjBndD6iYwf?QF&yt%ekrL+{F`p3l9 zBOMnLe^0!Y(g3C%?5|Z-$%>Sh%B;V0$W)kTVgZX)TD26`+pb-HiQ-WUCBX6|z*kk@h1ey~`HVqe(9IPg)s(MW%kh&>WZk9Wr{rO0I^M0T3jLZBSSef~07P+4P$$ zia)!kR6fOKGkr#ua1a3dzND==97`Y?<(q?H_4RId?CBrg+W+E~_F%;7$W>*pn|p)# zs@bY?r6{C!bVs>X_eh%B*FNC-+{>iyCEXY#K7PF>(#U{%@mg(jvjo(_yAsUPzE#8{ z0uq~9Dhx_2;PXgPr^I3ri5>ANyXDYTQts-5m9o-e(`I!(Y!0o-xa`XcP2G9f97USl@2)EcudA={Ge(bE`Kr2eBt5sL49+W26Jm{fg z&$)~@#2EuZ57vWL-I7qHm9iV%<%EOX3@Ae+Ut-ZDE^Ix2dB}W zy{f%=dAMxJ=O7Z|mu!u3^a2CcD3@);9Npb8TQx9rmqPJ|y`Y-wZe_%B&@ z+z(x~;tvJ2soJSY`LAYq_Wes!c=FYf@;{}lhNGEY692@3pr2@6>3C3#eEz2m$1GTo z%@aD*BJ$(Lp!^ef4Yh?g3H`ue1$gZlfX zZ#9zJp6yTQIM#%k)QW3#C1BBC(cF=7jg~;u$O|K}#mFl(BTK^6SEY}DK|jpMYV1uw zMm>9yehOEVd?g^tZdl^VANfR$hG4XGCZD#St~_Vkf{fLVJ*~=gdu!Y`N&=S+ZeVL>uMvPK`KDFFkJX$me|ZZiPM7EMocoCYA%6kN94 pW&n~cnx5u34M3(TxNN!Y{{aks6Y=Y02pRwY002ovPDHLkV1f#8;m800 diff --git a/app/src/main/res/drawable-xhdpi/icon_add_data.png b/app/src/main/res/drawable-xhdpi/icon_add_data.png deleted file mode 100644 index c70122f1684f562b9d1271f3649997b51f87492f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4879 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

3ozjG(r zv8b6VAW-rND$XE7)4M|AF=M3&I6$*4Kqn058j*74(tTt)mB8I*YZC48p+i;xMh7!g zon3Zfv6@J8qy&=U!;qI_>g!4KNFyB#P>Z0SX9#Ghq({vcW-Mf%)iyb&3`}pZia-|% zjMb8_J8%HtOtRL=J})xoiOqnmDKg}b)wq%UpIQ?dxi3bO?JW#>S@MT;k>}-kQlJ6e zz77fGOaR_$j#0Fd?vsI1sm-duPM*rTq*oze@;k}eW^#nYJ@k2ze1Jn4u+ZODYojQo z8%GOZSNz@pnxqM#QqhR0DU~!)fvEVzHU^E2pb$ebs}eM~L25$*dh!T6cWjr?7s2yBMr^U{QuiU!8?RvDE>Ax2HA^p~WO@&k<^^BOOzhJpVjZOxq+N3Uj6 znJq?Bw#PM0W|9Udinb9nDl#}KLo_d`*2OlEh5%y#Dm6v4QBq7P;FqnvyG!C z-BE2x1{GUmO_Pv88l((d91KpmklgQO2vB-F-keJ0$fQzf9;iPGlRlDx=1-9|Egl+u zLNOl6E7spdM4BXINF=*7G;l~YLt)0=G5}WjFba5L!i)e?IyVH=5dBHXWDb^DHULKI zOki3kCZR0#Dm7C%T%%b87}vzeTA3vgjIU}WQD>xWxiX>SOO6xlZF8l86HH7eZ+A3+ zCodaSZ>9lMC8m@2CJo@p%SP3kX#iD;>EylX{{i(Ln{ct}Miu}7002ovPDHLkV1f^T BJc0lK diff --git a/app/src/main/res/drawable-xhdpi/icon_add_voice.png b/app/src/main/res/drawable-xhdpi/icon_add_voice.png deleted file mode 100644 index 9be4643f0d4612214cdf670508b9fb4fa5101eb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5188 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 diff --git a/app/src/main/res/drawable-xhdpi/icon_camera.png b/app/src/main/res/drawable-xhdpi/icon_camera.png deleted file mode 100644 index 1c910fb0206dae49c8435e507a48a598f50a1ca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1391 zcmV-#1(5oQP)(A^N%26MF`P`xoK|BO}Dvu=k7l4$L_uF8|S>|-1oe9?>0}HP;f5{-aF1c z?{l8#_j`WNQFL9`@jv(|8KCp5QijoaCKMS)|C5Xk4=0g`r$aMb&!GZ~1I{_)p0o7r z7belzIF7N921VBZ9i*PF9DyVzghmw2Ua{@ajppl4%Pd*++%P&zVnh8$PG$;fX z0jueFvfPWhoj&9&bo^_ua{_wy#|RF8K8pCH4g$`~CIJo#)a?Sc*5#wJX5pO!Iug<_ zbTdg`Kwr#0p^%1y`$HHXO)`K)dV@tSJ7JlB&&g5o=DU96`3S4VMh5G^;w4VxEt}9Mu47Lne4Y}E~@P7&}wO%NR6vONg?6=S~c(PQ~?hK%!#wQ1K z`&+lrbCt+y0^>4@l3L`}L;#FMow3NkTg!vgwplJq?{Q=Qcg1o*H&zc#BR7|iNhx%< zjNF`cqv1@KIN7>V4(O(;Awj;`<@PK9ic8(_2OP8}g98b4Uy30zW~h=ngdq16c6H!H zn=H`HgO)CyN$$tjW}*7!T=)x|@MO_eLo}ixIG9B9H@DDoW?XOsF1OVsxRsqaf4>}~ z&u_XRbho|Sq(3)QX5+PO`N;CxcWW%7q3OUNTAIg@jFWx1znXFz?qSsGSAVUN1G;(R z4Qg_9<7v9Jq|}97djs$-nt9@k1QYmlPe0nvO{94(cMr3)j$e=kS~`FC ze!m><1@_&Z{XZe#-rAw5_$D;Ll0qkTA1p-C-7}~6-b+y&s_#XASJWC- zEZM+Ntf}i^IYw(LdQvqi&SKG=$@A(*y?DJofP!T%I2^`Q;-6$vN3cJRV;}V4e9M?| z3t-(X$}L96#w%r#K-UqVEUpp5XI*b+{zZ4WP*$Fe6>Gfk7doLR3Wlyv;_{zi{N5bG zU{8$IpuOB;bUe~63G~IMuA1{%^gKQS*&#S^RRMBxRoY~vmZK9%ghL7FNuEvlq0_P` z--m{5;7HFSa*V#Tt{Zy7yh_+5b1|_`P5vxrrXn1RbC%@K*BFOTRRs;*l0ZLvX8>*I z!Zg@UN%i#pWF~)}eC*3(cDeb*aK&S}sQ>mpIYv9$qByW?0AnLbGx4y1VglzWo`W{i zx@C<`cU!}bj+}fa-Z)f(mF0PIKs8OrAHRlix?vchU_t=P%o#d#R=ehe5w9P{vlyD` zdQlDb?9EkCvu8P0RpdiWa}JJr)_Xms4V~h diff --git a/app/src/main/res/drawable-xhdpi/icon_delete_p.png b/app/src/main/res/drawable-xhdpi/icon_delete_p.png deleted file mode 100644 index 2ee67fa888b5eca7c956fb6c2505223a6dd4b76a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmV(&_oaiP+c-axzw-T+S^oIr0NHxX~3D^M3=!5PocB5__@W(rek-jCxj zrrRc&eEIUe^rZ+}{@|A94+7w?859N-1J8Buju1OKY#`C#WEx-U_!QY%Gcay=T>!i> zON6dkVSH=mn|fIT7}dQYBA%;YMD)N(CT|~1<2J`O6A@lt}_=}EG~lCd}wrtw;sUDzIXOjfmEjvn+R}_s0YA15KWww zxg`G10=mZ^@uLv~d8bjs?;*f-2B05=QO_j+)A%giPSoZ<08lN5NV^K~(QLjlm0xSs zWLg)!vnh~M29^_6CA2;h%H9b8&SB)70b#&E<>Ul-No95&p>X?NE$uL1-Q~eKdck; zG5G-YpozZ!mN`#;V>1T;O%)0pOsBRw0A|tMWN;{sw=tOi#>MU_bx>002ovPDHLkV1f-a B-fsW^ diff --git a/app/src/main/res/drawable-xhdpi/icon_location.png b/app/src/main/res/drawable-xhdpi/icon_location.png deleted file mode 100644 index 61d0be513c0f9acaba54c8d0c5d55e32008557f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6304 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 PNJU@A_~s{V2mJp5*9oV$ diff --git a/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png b/app/src/main/res/drawable-xhdpi/icon_page_video_a1.png deleted file mode 100644 index 79cb866276fccfb18a127b69c22074c4fce9b82c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3427 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 FV1m~`t``6R diff --git a/app/src/main/res/drawable-xhdpi/icon_save.png b/app/src/main/res/drawable-xhdpi/icon_save.png deleted file mode 100644 index 3959e45277925698b9b486207dbbba856907a3a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12380 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 VCZQ6`{}x36RYfg@Iyr0D{{d+J*_QwS diff --git a/app/src/main/res/drawable-xhdpi/icon_trace.png b/app/src/main/res/drawable-xhdpi/icon_trace.png deleted file mode 100644 index 71b9dc90faf75379f3b0d89aa2da4f2dd52cf32c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6313 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 diff --git a/app/src/main/res/drawable-xhdpi/icon_voice.png b/app/src/main/res/drawable-xhdpi/icon_voice.png deleted file mode 100644 index 2b778ad9ad9847343629fe914ed8126e86b4bae5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1415 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 Eg6DCrOaK4? literal 8321 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 UDVIw8*bhKMRad22$vX1?0bC;W2mk;8 diff --git a/app/src/main/res/drawable-xxhdpi/icon_add_data.png b/app/src/main/res/drawable-xxhdpi/icon_add_data.png index 3248fa7c3952ea6b4a93f16870475686c85bcc2a..565137b1d66d16e2b46e1a929b2702953c28097e 100644 GIT binary patch literal 3084 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

72uX&k!Ig88I(1m@SCj0)`nh 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

xIG#&0>v=EMUx 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 literal 6353 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 TV^VPV00000NkvXXu0mjfdQU7y diff --git a/app/src/main/res/drawable-xxhdpi/icon_calc_disance.png b/app/src/main/res/drawable-xxhdpi/icon_calc_disance.png index 847684675523290e6ca2701d5181bbfbdb4b45cd..01df311f9daebd5fa799033aec2e793de2d74eef 100644 GIT binary patch literal 3007 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 literal 7348 zcmcIpWmFWvzg?E@kj@2Eq`N_uE~P^n>5%RP5s*gdMp9ytZd_PEx&>TPx>;apDS?Oo z_ddPP?|qn=^E9O6`ue}|v&4rme?wa^$r$%#p;q5?wCj?_>AI$EAO zgaQIctW>wxq(J9M)N)@4(CpNdLnlZ~@gn8~Uq?;R_7kqZbtV%xc&c78Fx+<9akLk7 zc>oVQLM<(|RRlJ*`Tb-_Xqw6kWPCU((_Fb8|89?a9LH%Xh#5WB-xJkC0U#2N>hi^N zhq~D7yaW*m+yC#Nkpp3S^V-F}V2n=7h}>8MVHYm3QkMS9^X$qwJDofzd-%;5Kp4$| z<8?Mx*33b4xSl-W!V9P~I?c1}%!$4IH_i+2XAo)ag^@abcjp<`Nf z-}Yw!$0`llSs~(J{W(!8)L0m--JUT+x|Y()Xs*0mRi8=OB#y}B!dHjpwU`t~1XaoL z4l@%I=ab-fM2iOUW|-T+!53O+mfY=0gLMLT^mP;>W5Su%uqE6GrPvVLTGn0TK{fy_ zMvK1IeotjM6=tR~h2|)D2KXh)7Xu{XS0rZTsYE*H2X$e;!>D?W{zVtiDY%RzL>jRoM)_2-tvQ{7ImTSu#LNNOTMgoN|tbMnYq-9 zWm~9iW%^*b`REpCguDLh7bfl;uPhn_3&MD++e5yZiRJ3zP(+oUiQk;%u7{BwLBo-$ ztdyF_QimM7{0cZ(E@W2ewM)G(nc2bZ8jp1^Nx`>^FRKFk2DTUuapz+ubXu@);1f*! z`t`|Mc(bFrST8cboqG}UrwjL-oooTR(1^n~xL{m{?N8I=;l0+V14ZKY+<;XCk$#`Z7XQ#K-$V5*uj&NXQTHT#-x9O9yDy9i1&p7Mv`m zEZ}bWpRjxuXZ%e79RXHdjDt7*vjXh4)39T~>CEF8w*D>hBHy20G*CgF*$S4Yo!%`s ze=luObXMO|UOV+xPvq$?(i_}cQbMCXu6Bq9l7lkP^34Wy<^wtNZV`Nh5jN3m_$jLR zUCS>J#s&H(4FrvOeo8-0@ftqzCDQcb9A^-FqYjpou+bT+mw4Dr71+gG(6sT1!bk?~ z>W|g9^28fj73^LHxF2$b@yN%Aw86#qsKEGsvFT?EYGMLdikxY5XLEGnFoy{DFA?;# z1!r{)2f2O&Ww?1%WJ}Hoa+u@;kSD=LC z=hmu>F8hf+KK}Qe>h^ua5s7<-W-)3SxJaG;Wk{22(%ISiFqW|mb;n8of^Up;FviW9l`sSC{ol%Ue;A zeOald3QN)*k1d|-P?RQ}E$Nx%EPW&b-6tu7r*|?*MMZT!?Gf$VzGe@{^nKPt^e;3+ zcY=c|un4xyU!>>;lf>!b4d(mWl*YurCk!3tEl5HTKV2saTqTdIN#nCY zUxq0`IRhM>@8DG{SA%K* z2PpQuWj5&fO_?t5_*RhF5=*rN)-6`A;7;kewew;4q@JePAY_xuM5(ON+}Iq;FmTU} zarymFUR?XbkFg;NEzaY0&Y>0yzmY5pDBS0*cBxpi0dGI`h!Nd6;@aOB(ocf(oAt96 zRl7Irr@Y(_-v+-5aG8R6?GKL3`*%Mve)_u?#8JG_jQ;S@oMTQOSE9=jS7q-|%=;Af z(@{RroqDdPJ=-j3dc%qJ9|oh7%PyKiZbttnWy>*E8+4*mixt`%i%rb)rpi~H@ z<Z(&6k_Sw3K=pIF1@5t1 zz;sPd#vA%F2ZhWCA`~w0tff7CgrVx|j<(6vSY$cqQ-Qw5iTO538+*kA&;B07{P^AC zi-X;&`W*@*$u&(p=TZ^s}@22+sxq$D>UR8agZ2ygN5$^wR zzi&?@zQl4-qHFakw!+?_miK9%ct%kUMw5h0RrXUP_|Qu{!k%&2$FGZb@yCA%1vT@$ zJf8V&{&I83Mo}7SWIC2Unnu#QinJok%a$KI5z<5pzxnoIatHc0Yx<8mR3I ztzlmxwrN(Xh4_S{C<7^S69|kFf+;s=01bXtsW! z1&yjNTZ|Pp=Uli*FiJzGN4Dsla%h*wd)Bpn&%<0KM2LL;6K?+>hlTW-n2ni9=8 zwQdtGBa>cG7sr|If^AkKF#(#0jR!BZbt;81hg*4#tDH%YY2Au>e#&rRGd}|7bccvH zt;{^OoP}8={UKQZFLlaexkHK{FuO%*5!g-D~=EegV9gq!vpBr0~J09 z_#YpW(MvPVLMM>_@PIzj;1T&2x;c6$IjrCXZH+|^|Zdg9QmbnEyEE{1ew|# z<~t%Ee0ej%UC3hw@R%vmGK?+s5D#Ka>GZVxupi36T}T-Pdp25pSe&G~rX*dxe3w@L zV(ckv6fCRqZ2_-RNOkJ8|2~szDE7-G=YnS;IRif(Pv^u=f^OE(0+F$J-(+&t@3MI5os62*+78FLw}gtU!H|RJfS%RPORV&Go{+j)6LjMh(kIR z_w4;$J`(dU{v;k%6fCAv4}ZeIyKV9?NBB8WlaZQhEu&y_f@?9pFIsjK6J23fZ(zk? za|265A*v%cWLql-#}2Nqk8WH&%TarXB@_iSCwmR6nVPz67}$8mF4^#-nRSBRDP^^? zEZYgZS8`Cx(9l&q6D)1*lpc7cP=}Vzho>iA`+zhvS$iVtJ-g)f^>B6x{LyVw%dH;G z2~&;uK(wPD--6+&qGG41*}{;Oup>qu9)ks?f?Cz?n-SHt+`Ud6Of3~dln%auC#x9| zN%@?cqX%*vcPTFxSnU7NJ}_$ojIqT|8wr(!CpG43*Y59WNurGvR!1e$9?2d-b}}f{ zQQZUIVp|f7(R|zfWk@HC<2D3?ncA(ZH-j7&UmLpKLbK?i7Dye4e5z7s-gGSRqeHR? z8wy+v3&at^a>mXl>&k_(3BShZ04RTVZHd@|^bLHDi;~>XZLL`~N5ZWW*;y0fJY5uY z%OQ+5o1J|D1@?l9%4wzr#uY9PhQ&;}dKP5qNNKvHX3~zhh#=^9!$QRn!re}dSLInk zrhYqLN?Y~I=sXIV4A!*hN*d!mkKh-T&#CT8XCWmCzJh1#;EZoWg(4}nMX>V_L9fsV z^eQ(gqNWHf>*?8Le#83t6@psvi7mo`!e(luXJC;iPy`!RKPiTwl+V@V-^+vQ5zo=@ zBC$5K3}**Z$?W{!5jFDbx)31x;>wO z_0|MFuV$IimV@r1GKP|RKq#ft^KY{Yf360s^=6s;Quj)4W8M1B3W*nKow7E(2?>_!S)~5fzFJt|=pR~5 z8k$btp(NeD%eY!AowQV^_c#9ytzv&X!<1%W&V6FE@RlIq+kv)eX)XN6EobtArv}FV zXu#>dO1e$UVLq}GJ5u5L2}qCZ-yJt;(n5P=bp7-j-B&;qj30Jpz^xY|?^4*>j_iNY zRp|N&)vk|EvHJf7lg)@kz)~s$&E&c$D3bXzRv+)ouNF+LoU2r*S}iJbAAHUN>?WBk zQt5jxm)&2RG5R3*Jx!=AoW&daM%8MJ`O0+XKbNd%6fB~=p>-eULcawbgp;6h?Bg5D zSr>rR^i|j5ttO7`;3*&!V_Cyct%MArI{0Gpaww+Eh{)WlabkoMHp|5kl)97a)6Rt& zF?H`+cFo5oEmuPPw-?DTe4aV3B986yZaqHr{=q!e3RF2aRZ#JJlm^JyM0Y_bTc?2g zMsvZLI(N17QHLTPmtsRc?OpG|Msk@(S??PvIcfQi@0m|Vzw0p~sR<*LME3b|tTB|7 zEIpjm=9UcceDJK1w|*UMowFz0aYAd;&8@(*xbMW~!8`Nz(zXRC!YD;CUjnWWTAV>P z>Cc*p9@HNnUoL=rcu9OD(on(B!>2ToynoL!e9h|pGR_A6XB6%365k)>FGq9Fv6^G6 z=YZUQ5I8;#cxyS~?*6IqJs4eAZ|U=f(%GO^c}ErvTVJg)#e zGg~A#wL#|EQ7U=0Rw1cLDz`|v*InVFjrpQvZy+xgb$7Fg%oa@}y~~yL5dRRL=f7!;v zJe!8&zd6+(*3|s^d07y3jdrRY7ewayX4Yl+t2$-a7L>pWVxRK+)HBu?Vo z%XGB8&kEss4$&nS$#+lJ%%AX82cwvPAZb{O1b zUglC|mBtk&LUXPsERl=^PCnc644Ue5 z**LH--^)?x53eeGv~-=V=QkNELocN*D_Uty3Oa0BcK?h|s930Y zXP9`GGv`&KIl+UPM5=jkWoL@yL{>p!Z~rbUJmhyeW$a|lB<5XCabO0Era*SEpKm|V zu|@yKz%((%Fh?XxJdmhxa`hd!cW~IC2!EAxJ)_$0+hZ?t1VsOOl*&h&8*w%Mf~Ol= z53+?{z;x%9H^_sJo8mh5J(Ee>Xg(#B)dS0g?tTQi25dz}Y;mEw1vg9B&f<8KWZIz` zP<>{cS0vO-AE$6P^xn>zPyMjkPfc01dd0(uL2LKIhwbfwWSYm;V0Okzd(1a0g&2xvoj;@$D3D8uOB$i806r zrfl0AQ|tJO>R4Q}Fr8>ZzAg}w%vTcJ5L`x&21WfQ*A(dZ$WXtI&fd!nwtB(Y3u zNj)>Jf!|8~aakhQJMonkC^Se!0qb{5u&kJ;!*RkT>d)u4FPq8ff^|m4pyy;khMM*##<=k4vG< zs!E`TQ_Z`Ki%XnKiQG-$FKIJ+pqvuk(b1So)64Sf9e&?<3ljEVTV`y?u1-PK@sy8T zRUTh@{|tZ?TFQGgN`qel)-Sq?#P(z~S{- zvu2HAQXV|9_~$5>&HY8cX2-dDly0$yA-2zEs9j(Qdli-t;3WY`;S{oPlS`Os_MKR| zLBx{_YT33STx;ix;-t{eBRjfkL1sW-r-;?{Pn%7Gz`eOJ3z|g|oUX6=gdOE=Jxe>@ zauZvg-Y^Cd5?OLQxIVnn9_KG3Iv)8;fIdL>)eb0qXmh6CD4HktC*1RlDnnC(EEV_# zJE}r{BiF;DZ)>j_AT;93SD*|f^L+SO@Je&y$b z`-*QFcw{2p5YUek?d?#TSN@Gw9$BA1#-!4`y{GC(E_@UGL91UN* zoBZF?T*zT>1)q53y!tF%@Fu2Cfb$NfNVn;FHaO{pjep2`3=lXyj3}J`s_1ay*@}({ zEgBUZabX=Ko4Drt7_jYv*m}Y~`ZM%*o7u2??Lb51i!O4N+hT4k;~V|C0&oPjS6xvM ziq?YCfG&YF;52&grH@$H7J2JiY@0ArU@Ze8q(>y=-Ebk&z6D`RU??)@7aT}|`2_{S zd^4Hq3GpOP2k@Dv%VNC&7z!z%;qf`cy)x??muku6ou$0@f*sr8JiIPgh--=1g;{*X zQzKHEcjpUxSB>ZHp#-AAeeELW=r&{o?zomiaT|U2%5K%p2`*oL!6@ELbv{|MJpy%u z0<8bs0b7HZ@y-C5e*O6c_B>r&fjb;vX8{JhWFK@FN(99ZJ7VOw^#ih2G`@=#DgYms zHu^Zo0u(Y24}SjaBLgp%RA;50rR+D;Fshn>zX<`>-}Py12n03I0U8)5(vAYqjof(; z?CTL=!B{wqV2+Ek2#XGXeY|5mF`O_Zz)g7d^osvgxy?%~nNE?S5Zak3$T-lB4_q?ETr9_UHGwFl9e>NB`1$IoGX_KC+=oor z`RJ1?ct6E4CKh{F<2kW(UCHgcG=t#BnFc%zGu3iIH{3-%< z-suA8KrPru3Tb$u`KcTSc=8ve#poHO1y^O)e)wrRfxvypR_^ESN{~ZrRJx=M1>nX~ zofuW0sIYEI;WolxRfvmjdLQ;3HB2CIb!{67#C&t%WX&#q&G4rP;K|Krg5Ic8L8Fse z-b1oz+;!5X{n`g}BFr!1RGr7jtoiFbuMQ~rTqj~!JgqhZwqrOAE4HmWcG+ZaoPMK>rzcX(kZ z%Y9iUwfII3S5u9dR}}P2+Qz%L-Bcg*lXGl>NudnKPLjUe3Pz@Il|DnsH6}-o*<#-M z*tDC2blbJrrmz~bLJaqCz*}i}C86N3kwb&DPgYWn#Pybth+b%aNF}4EAh?Ro-(}sR zB9did;WOuzP@18W60~Ce`>XsMwOJ=?hpEev^$DHzW){S2Jd7iQhJSjWQvEnMvlI}u zAjBS^I9BxN35>XY+`i2Q(mVYs-lPzYd-M%S(zJ1!sq diff --git a/app/src/main/res/drawable-xxhdpi/icon_camera.png b/app/src/main/res/drawable-xxhdpi/icon_camera.png deleted file mode 100644 index 4416e550e0579866f953eef0b3cdb9fb786c4eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1677 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 B-fsW^ diff --git a/app/src/main/res/drawable-xxhdpi/icon_fragment_close.png b/app/src/main/res/drawable-xxhdpi/icon_fragment_close.png new file mode 100644 index 0000000000000000000000000000000000000000..b026297ca45b9790e79b8e8572e8e23391b839bc GIT binary patch literal 1984 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k1.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k1.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k1.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k1.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k10.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k10.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k10.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k10.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k11.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k11.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k11.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k11.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k13.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k13.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k13.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k13.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k15.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k15.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k15.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k15.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k2.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k2.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k2.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k2.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k3.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k3.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k3.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k3.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k4.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k4.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k4.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k4.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k6.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k6.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k6.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k6.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k7.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k7.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k7.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k7.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k8.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k8.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k8.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k8.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_kind_code_k9.png b/app/src/main/res/drawable-xxhdpi/icon_kind_code_k9.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_kind_code_k9.png rename to app/src/main/res/drawable-xxhdpi/icon_kind_code_k9.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num1.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num1.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num1.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num1.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num10.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num10.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num10.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num10.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num11.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num11.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num11.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num11.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num12.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num12.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num12.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num12.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num2.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num2.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num2.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num2.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num3.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num3.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num3.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num3.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num4.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num4.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num4.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num4.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num5.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num5.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num5.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num5.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num6.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num6.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num6.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num6.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num7.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num7.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num7.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num7.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num8.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num8.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num8.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num8.png diff --git a/app/src/main/res/mipmap-xxhdpi/icon_lane_num9.png b/app/src/main/res/drawable-xxhdpi/icon_lane_num9.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_lane_num9.png rename to app/src/main/res/drawable-xxhdpi/icon_lane_num9.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_location.png b/app/src/main/res/drawable-xxhdpi/icon_location.png index ce19c87feb0a804f445563e712d863106c5474dd..9f85a33805269b70c2d8ea6fce9ee780262142b1 100644 GIT binary patch literal 3217 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 DI3^Lf literal 6833 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 diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_geometry.png b/app/src/main/res/drawable-xxhdpi/icon_main_geometry.png new file mode 100644 index 0000000000000000000000000000000000000000..b1dcb59ea73b026a4b394cc88bd85ef63db129a2 GIT binary patch literal 1086 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

ue1pz(em(9%fP0wS(+J`M2zuu zi;>aaWbJhT9p1#;P@v#>R7D;x3UhRt=)DeS%Y0pelww-yNi^A4?eDSj{%~Rk(-%@v zwHfy_ZhjCcfe%LCrz6m_F#{#+#=xGyKst9hQf1)SkMIIJma!E7+uS11+gh0k7jt%) zB`?D)ajx`lFC&S(Vlz`ELTI+N^|ayOh_%f{KBiTe*Wx# zSKffW!+*C`Ex-IIYF($tZX-t-hko*AY>z&^XI}HYO_2fx{z)}fVfg9fZCwK^W>SQ$ z`O*j5_Uq1v%Mp*i@0SPFzQj?%)UY1-Q?Kt5Zlxb^D1xkkjL!&rvZQyMT`x-lK|%)B zxwk}klYtD0SUUr+tjD=2MP44iuYYuZ?e3J8@$YASi+YiNe%ndi^-R(if+gA?hC3w* z!yw`~sZUBeQ;Za@iK0mblf?^Lq4_0r7I)CdyPeu(;#}MILf5^*6s@WKEswiq62y6( z?3H8+k6`*NnG91Ny{G;ePC_`H!aAF%3c{74amV1YuIPzp1md2P{N3|k!&=vSm_RJ# zbxl1JYX6=1DTFZrdCGND5IW~%N9#w08!CmSkv*t)@#qd0NXLAul{f`RxtATIueRMA` zNW3I%O80qoDZ=Tp4|#v;35C*4N7mFX!|693X2YUOhMH6$$q^w}X|*mJ4>{WGKX5c> z#m?U=pNbHPjSkH2q$W(IT}0Va=X=$}+>df{3Lt5mExkaA;=*04CIqf~MhhR5ff2{E z*P2*hVzJ?ay2kZ#csbs=%fiNlix6^1PYO%feCJ}Bh}pV+tHxl5TI<1KDRTC}VPkPw!f5GG>>C7Iz(gMDoD53eb0| z&xeooPvYgRXNZ5N%Hc%z<|PD5t329u zPcOOs*(A@SQf%HBKrc;=i_iTE!B{c&vXfmBi%rWr^eNp@*ChEolZ1H>WC<%pg?_}c zVyGx;*LK&zbTo)r*$Uf7sn8accS?}ed2g>)*aS=oPP)x6SmU~gmSLCUJHL1jvMJq? z2TSQWd}57yq_li4{5A;<7&q{#;16+>T3HrG z-i5#QC+8#{;U7)L`FJ;yRQVeVH;w1Jt8bl1>^nndl)db6s_AL-v5~EgvksGi1A$J46X0TiwCK>Sy)9ngC7++^5pUR!KgZyDWLIT{Jv?U=jQy>%o^Z3+v-n;| z)Sy9;CPJ^CcHtMTa+V$XFM?{XPGzre9eEX1vVv5dad=46$wAhY%K#=XSsk`oZpL;@ zK+hn1A0THXxLO9_l6bKs!pUadSf))-dN$gBo(DmR+ z(sQqe_|rUgH3?Q@_`4eIJx-aMh+;20#}^BL#9J*w0A;)x+7||T zX0O?1#}9H?j_#x@v+KF&IbYX#o36uFJV|XzE`R!j>Gya5+WZ+FJ|PIGolQ3#aAtea zGR-A*(5;v`vax9J*ZRd7>(q`)v9w=F1h7>pWS~p9u`5CFE$zTKXnd4&N83<%(^vDv z6PDe7;N!gxaG(e&$LZ)#WHofOcV;H^&2aiFYtE9cg`akR+b7FkeEX~V;7b)N_a<^u zpd8|L6a@&_@Ej#6j@*q#F|1GD*3}c6YzQ71HVOS7CqBA7+aW|IsB03K|umbzj; zCf@C2XDtDlX9}cklM+1BVqjmqyZx*z2pv3UDmFItmSi(jv=6T5i2YZ)m_L_wEP$=< z!fSom_1o`FDEGdKGdMGnZ|jhH?p2CPdc!E4 zVV!aEnEiT=v&}`no85ua#jp8S{KclyXjq5~wg6%LO3{K{BpC()d!IxK%C#&Le!xa3 z6yN91(jApR4Fic8Id+w3YhVpohD?`^(#M_lC7WkpBsw(5y<)ycujkqDFlbit6MYg*1H7T> zHOF(D-1(@bM&^C9=<+-x`Bd&nXs>qx>Dw#pXj&5p+@8e<4{_LSGfoKLVe%EjNuTJc qfloZ(!YB1U{|&Qc;s0C9wWq3ZcBe+t0q)Zx0J0xGzb}*2^Z8#fxmpMS diff --git a/app/src/main/res/mipmap-xxhdpi/icon_road_direction.png b/app/src/main/res/drawable-xxhdpi/icon_road_direction.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/icon_road_direction.png rename to app/src/main/res/drawable-xxhdpi/icon_road_direction.png diff --git a/app/src/main/res/drawable-xxhdpi/icon_save.png b/app/src/main/res/drawable-xxhdpi/icon_save.png index 3959e45277925698b9b486207dbbba856907a3a5..436c6527bf77335b98ee87cfb64cc1c724abf4d6 100644 GIT binary patch literal 994 zcmV<810DQ{P)Px&oJmAMR9HvtnMshY96l zkY2P%d<=yY(X>HSqvnFckQ97CIIx^p5m8yDJN_SQU$#fjch0%r`JlnwBfoprUi-J# z-g~`NN=f{Whoq!okQV5hzpGJdAv0V`X(sR#&5b~qS0NVz7m7*SBu$I~@|L98DWx}o!?EGK>^*mMR7fB9 zLP@qv({WD#TSI67>3;|4{)$Dn00**fo(kkH;KSnKc!8#e<4wE-ybzGLCC&5+#Z_1X z904AT?|zVrfE)fj709)~(Rl3xV>DT@_?~lwA0#cRTq9f0!NXp}W1Xa$ntY01Zd6TmYOzNP}{`2905A?aWx zG>+^it=ySPZJOWq{)ODlC_~N`;kFk@hqXNZ0{-a;=8ZmFWIFExpY#ct3$e`Q1mkO< zZGz!>bEB|(B9wd%IG1!9=1O&BOI9JBZk=qZnJbol1ULgMiNAjdygm&%ZAqw2dfl9I z2P2QNq#fIx%*}#oeaa09OF92Gp=C|Dusnt%BD6&rX((l;Glkae7k zVBo2zC9MkGZXCGm&1$c2daN@SMTLR QzY+8jYlR+&lMGwdb$u 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 IM6N<$f)tmp#Q*>R literal 8613 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 diff --git a/app/src/main/res/drawable-xxhdpi/icon_task.png b/app/src/main/res/drawable-xxhdpi/icon_task.png new file mode 100644 index 0000000000000000000000000000000000000000..91c3d4aefa5c28231c859afb8fab932f0792445c GIT binary patch literal 1615 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

Su17UkfsyW5f=K@1$iSCYbXZ%{k#R8Hr_|V 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 WN;1m;q(qkh0000e#t00001b5ch_0Itp) z=>Px#lSxEDR5(v#)Jyp$!_4?=9s?tzGa~~76T`rRpZ^#bdj5U?-p**0_VF+i3#ZM$ zKi>!5Sx^@+v+*+g`}w(m(J1Z1Ck6&4UIvE$gT`@;Ol%DQ{{LRXXqfh)otc%V;{U(j zgTsA{j0_;R{QdXemr*76KRe&A&u$F=|2r`-Ft7}8@G&wlFueZD#Iot)46X|R#{n^e TW?-@S00000NkvXXu0mjfG%#K6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/login_bg.png b/app/src/main/res/drawable-xxhdpi/login_bg.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/login_bg.png rename to app/src/main/res/drawable-xxhdpi/login_bg.png diff --git a/app/src/main/res/mipmap-xxhdpi/login_password.png b/app/src/main/res/drawable-xxhdpi/login_password.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/login_password.png rename to app/src/main/res/drawable-xxhdpi/login_password.png diff --git a/app/src/main/res/mipmap-xxhdpi/login_username.png b/app/src/main/res/drawable-xxhdpi/login_username.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/login_username.png rename to app/src/main/res/drawable-xxhdpi/login_username.png diff --git a/app/src/main/res/drawable/bg_select_sound_xml.xml b/app/src/main/res/drawable/bg_select_sound_xml.xml deleted file mode 100644 index 46b9cf09..00000000 --- a/app/src/main/res/drawable/bg_select_sound_xml.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_back_xml.xml b/app/src/main/res/drawable/btn_back_xml.xml deleted file mode 100644 index 7368f389..00000000 --- a/app/src/main/res/drawable/btn_back_xml.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/dialog_bg.xml b/app/src/main/res/drawable/dialog_bg.xml deleted file mode 100644 index c08ea5cd..00000000 --- a/app/src/main/res/drawable/dialog_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_bg_cancel.xml b/app/src/main/res/drawable/dialog_bg_cancel.xml deleted file mode 100644 index f46b1ed1..00000000 --- a/app/src/main/res/drawable/dialog_bg_cancel.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/dialog_bg_ok.xml b/app/src/main/res/drawable/dialog_bg_ok.xml deleted file mode 100644 index 5dee094d..00000000 --- a/app/src/main/res/drawable/dialog_bg_ok.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/drawable_bg_tittle_blue_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_tittle_blue_bg_4_radius.xml deleted file mode 100644 index bf8bb180..00000000 --- a/app/src/main/res/drawable/drawable_bg_tittle_blue_bg_4_radius.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml b/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml deleted file mode 100644 index c5e07a55..00000000 --- a/app/src/main/res/drawable/drawable_bg_white_bg_4_radius.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/fm_card_map_btn_bg_line.xml b/app/src/main/res/drawable/fm_card_map_btn_bg_line.xml deleted file mode 100644 index 518567e4..00000000 --- a/app/src/main/res/drawable/fm_card_map_btn_bg_line.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml b/app/src/main/res/drawable/fm_card_map_down_status_bg.xml deleted file mode 100644 index 1dddca69..00000000 --- a/app/src/main/res/drawable/fm_card_map_down_status_bg.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml deleted file mode 100644 index a3b7c80f..00000000 --- a/app/src/main/res/drawable/ic_baseline_search_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9c..00000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/icon_down_arrow.png b/app/src/main/res/drawable/icon_down_arrow.png deleted file mode 100644 index 0c6cf5de2ee4be3d94f22da551ee002168cea387..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmV%SE42b<49Zc~kLE2d2ibZx;4zYzb?&(Xi zx;PJbtPsE8Rlg9=jN&u4sc3>;DlXWo`^E?=L;;BIkXob*2cJOLB^8WB&B_bdPa002ovPDHLkV1f!dWdZ;I diff --git a/app/src/main/res/drawable/icon_item_high_bg.9.png b/app/src/main/res/drawable/icon_item_high_bg.9.png deleted file mode 100644 index 6dbdd625dfcbc5b362e0e0cfe04c431ecbf08978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 840 zcmeAS@N?(olHy`uVBq!ia0vp^Pl4EtgAGU;I|hdVDaPU;cPEB*=VV?oFfcQDx;TbZ z#J#<{H)}GZMBBp}kE2T$tbO6w(f&ZoqO-eu_H4Pf?$zF}6;et!HZABl>iB`fWsVKA zqkwnahGQPqw>01L^L~4E=ljX&-S@l~zBKr>b=85QtIfv${vMXB|F6COZ}NtdB^!;U z+S;|_trZ*=xFlFg)kgf2dzY8Tci$z_DXYc7&tZzC{dJa8tS*s$SrY~g_rZOQ>62e3 zU0;6lX+W&-362h<#m}cXG&g8S2lxt6#+}nq^!(<*?(y5Tv&FA{+-MWr zc;NQm%7dqV`N;VEtGQeMKl@M3p07V%%s;00{?2bZ`~8N0%Iyz6UM_y!{qE!`TzBd} zEG~J!<+xb)#fLd&zkWVDdhJ``l=b(|#>d{1%bWkLIduQOui4U9Cx5%<^5FCI!={y! zW*wj5GkyNIxN~xE?RIV{msz@BXl3J8Ck3qs;g!1H}> zPwxn32nnPLuZd&|WDFe4TnoXc7yqxwsnXrd!m&op;14Uuv0lYB*>@iTvj&5wtDnm{ Hr-UW|RWx4~ diff --git a/app/src/main/res/drawable/icon_map_zoom_in.xml b/app/src/main/res/drawable/icon_map_zoom_in.xml new file mode 100644 index 00000000..23f9139d --- /dev/null +++ b/app/src/main/res/drawable/icon_map_zoom_in.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_map_zoom_out.xml b/app/src/main/res/drawable/icon_map_zoom_out.xml new file mode 100644 index 00000000..d2ecee10 --- /dev/null +++ b/app/src/main/res/drawable/icon_map_zoom_out.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_select_sound_defaule.9.png b/app/src/main/res/drawable/icon_select_sound_defaule.9.png deleted file mode 100644 index 61f976cd1fc1f6bafb508ca2d1140092761b75c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67532 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 b%vleN-)PjeZ!cp*WcH5s4R804Jo*0swV9T; diff --git a/app/src/main/res/drawable/ripple_btn_checked.xml b/app/src/main/res/drawable/ripple_btn_checked.xml deleted file mode 100644 index 3d9ab431..00000000 --- a/app/src/main/res/drawable/ripple_btn_checked.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple_btn_normal.xml b/app/src/main/res/drawable/ripple_btn_normal.xml index 3fe0aef4..26bcf8ee 100644 --- a/app/src/main/res/drawable/ripple_btn_normal.xml +++ b/app/src/main/res/drawable/ripple_btn_normal.xml @@ -1,6 +1,15 @@ - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple_fragment_save_botton_bg.xml b/app/src/main/res/drawable/ripple_fragment_save_botton_bg.xml new file mode 100644 index 00000000..1a7673af --- /dev/null +++ b/app/src/main/res/drawable/ripple_fragment_save_botton_bg.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_adapter_item_select_bg.xml b/app/src/main/res/drawable/selector_adapter_item_select_bg.xml new file mode 100644 index 00000000..66130e40 --- /dev/null +++ b/app/src/main/res/drawable/selector_adapter_item_select_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_bg_blue_gray_bg_4_radius.xml b/app/src/main/res/drawable/selector_bg_blue_gray_bg_4_radius.xml index 63b99406..2cbf83c2 100644 --- a/app/src/main/res/drawable/selector_bg_blue_gray_bg_4_radius.xml +++ b/app/src/main/res/drawable/selector_bg_blue_gray_bg_4_radius.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/selector_bg_gradient_checkbox.xml b/app/src/main/res/drawable/selector_bg_gradient_checkbox.xml index 0025cfcd..05a02e22 100644 --- a/app/src/main/res/drawable/selector_bg_gradient_checkbox.xml +++ b/app/src/main/res/drawable/selector_bg_gradient_checkbox.xml @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable/selector_bg_video_button.xml b/app/src/main/res/drawable/selector_bg_video_button.xml deleted file mode 100644 index 5815701e..00000000 --- a/app/src/main/res/drawable/selector_bg_video_button.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml b/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml deleted file mode 100644 index facbe9cb..00000000 --- a/app/src/main/res/drawable/selector_bg_white_blue_bg_4_radius.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/btn_delete_xml.xml b/app/src/main/res/drawable/selector_btn_back_xml.xml similarity index 78% rename from app/src/main/res/drawable/btn_delete_xml.xml rename to app/src/main/res/drawable/selector_btn_back_xml.xml index 22730a78..147a5505 100644 --- a/app/src/main/res/drawable/btn_delete_xml.xml +++ b/app/src/main/res/drawable/selector_btn_back_xml.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/btn_bg_default.xml b/app/src/main/res/drawable/selector_btn_bg_default.xml similarity index 100% rename from app/src/main/res/drawable/btn_bg_default.xml rename to app/src/main/res/drawable/selector_btn_bg_default.xml diff --git a/app/src/main/res/drawable/selector_default_button_white_bg.xml b/app/src/main/res/drawable/selector_default_button_white_bg.xml new file mode 100644 index 00000000..f79bccd6 --- /dev/null +++ b/app/src/main/res/drawable/selector_default_button_white_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_default_text_color_white_enable_gray.xml b/app/src/main/res/drawable/selector_default_text_color_white_enable_gray.xml deleted file mode 100644 index 18707d36..00000000 --- a/app/src/main/res/drawable/selector_default_text_color_white_enable_gray.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_fragment_switch.xml b/app/src/main/res/drawable/selector_fragment_switch.xml new file mode 100644 index 00000000..873713ed --- /dev/null +++ b/app/src/main/res/drawable/selector_fragment_switch.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/selector_road_line_bg.xml b/app/src/main/res/drawable/selector_road_line_bg.xml new file mode 100644 index 00000000..290794cd --- /dev/null +++ b/app/src/main/res/drawable/selector_road_line_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_road_line_btn_bg.xml b/app/src/main/res/drawable/selector_road_line_btn_bg.xml deleted file mode 100644 index d4f61e9e..00000000 --- a/app/src/main/res/drawable/selector_road_line_btn_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_task_head.xml b/app/src/main/res/drawable/selector_task_head.xml new file mode 100644 index 00000000..2c068c15 --- /dev/null +++ b/app/src/main/res/drawable/selector_task_head.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_task_link_edit_icon.xml b/app/src/main/res/drawable/selector_task_link_edit_icon.xml new file mode 100644 index 00000000..654327b5 --- /dev/null +++ b/app/src/main/res/drawable/selector_task_link_edit_icon.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_zoom_in_bg.xml b/app/src/main/res/drawable/selector_zoom_in_bg.xml new file mode 100644 index 00000000..fc752924 --- /dev/null +++ b/app/src/main/res/drawable/selector_zoom_in_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_zoom_out_bg.xml b/app/src/main/res/drawable/selector_zoom_out_bg.xml new file mode 100644 index 00000000..cd58f01f --- /dev/null +++ b/app/src/main/res/drawable/selector_zoom_out_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml b/app/src/main/res/drawable/shape_bg_blue_bg_4_radius.xml similarity index 100% rename from app/src/main/res/drawable/drawable_bg_blue_bg_4_radius.xml rename to app/src/main/res/drawable/shape_bg_blue_bg_4_radius.xml diff --git a/app/src/main/res/drawable/shape_btn_check.xml b/app/src/main/res/drawable/shape_btn_check.xml deleted file mode 100644 index 3d3dd947..00000000 --- a/app/src/main/res/drawable/shape_btn_check.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_connect_bg_enabled.xml b/app/src/main/res/drawable/shape_btn_connect_bg_enabled.xml similarity index 51% rename from app/src/main/res/drawable/btn_connect_bg_enabled.xml rename to app/src/main/res/drawable/shape_btn_connect_bg_enabled.xml index edd37fc7..f208d33e 100644 --- a/app/src/main/res/drawable/btn_connect_bg_enabled.xml +++ b/app/src/main/res/drawable/shape_btn_connect_bg_enabled.xml @@ -1,6 +1,6 @@ - - + + - + diff --git a/app/src/main/res/drawable/shape_btn_normal.xml b/app/src/main/res/drawable/shape_btn_normal.xml deleted file mode 100644 index f5bc245f..00000000 --- a/app/src/main/res/drawable/shape_btn_normal.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_red_disconnect_bg.xml b/app/src/main/res/drawable/shape_btn_red_disconnect_bg.xml similarity index 100% rename from app/src/main/res/drawable/btn_red_disconnect_bg.xml rename to app/src/main/res/drawable/shape_btn_red_disconnect_bg.xml diff --git a/app/src/main/res/drawable/shape_btn_video_press.xml b/app/src/main/res/drawable/shape_btn_video_press.xml deleted file mode 100644 index 14b565e9..00000000 --- a/app/src/main/res/drawable/shape_btn_video_press.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_card_bg_default.xml b/app/src/main/res/drawable/shape_card_bg_default.xml deleted file mode 100644 index e716c562..00000000 --- a/app/src/main/res/drawable/shape_card_bg_default.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/shape_card_bg_select.xml b/app/src/main/res/drawable/shape_card_bg_select.xml deleted file mode 100644 index 7dc4311f..00000000 --- a/app/src/main/res/drawable/shape_card_bg_select.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/shape_default_inputlayout_white_bg.xml b/app/src/main/res/drawable/shape_default_inputlayout_white_bg.xml new file mode 100644 index 00000000..a814abce --- /dev/null +++ b/app/src/main/res/drawable/shape_default_inputlayout_white_bg.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_speed_limit.xml b/app/src/main/res/drawable/shape_icon_speed_limit.xml similarity index 100% rename from app/src/main/res/drawable/icon_speed_limit.xml rename to app/src/main/res/drawable/shape_icon_speed_limit.xml diff --git a/app/src/main/res/drawable/icon_speed_limit_off.xml b/app/src/main/res/drawable/shape_icon_speed_limit_off.xml similarity index 100% rename from app/src/main/res/drawable/icon_speed_limit_off.xml rename to app/src/main/res/drawable/shape_icon_speed_limit_off.xml diff --git a/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml b/app/src/main/res/drawable/shape_left_fragment_bg.xml similarity index 53% rename from app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml rename to app/src/main/res/drawable/shape_left_fragment_bg.xml index b3143d0b..20e9cee4 100644 --- a/app/src/main/res/drawable/drawable_bg_blue_frame_white_bg_4_radius.xml +++ b/app/src/main/res/drawable/shape_left_fragment_bg.xml @@ -1,17 +1,19 @@ - + - - - \ No newline at end of file + android:top="1dp" /> + + + + diff --git a/app/src/main/res/drawable/login_inputlayout_bg.xml b/app/src/main/res/drawable/shape_login_inputlayout_bg.xml similarity index 100% rename from app/src/main/res/drawable/login_inputlayout_bg.xml rename to app/src/main/res/drawable/shape_login_inputlayout_bg.xml diff --git a/app/src/main/res/drawable/shape_middle_fragment_bg.xml b/app/src/main/res/drawable/shape_middle_fragment_bg.xml new file mode 100644 index 00000000..593ef0c2 --- /dev/null +++ b/app/src/main/res/drawable/shape_middle_fragment_bg.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/shape_rect_blue_6dp_bg.xml b/app/src/main/res/drawable/shape_rect_blue_6dp_bg.xml new file mode 100644 index 00000000..4dec9fa0 --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_blue_6dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rect_e0dfe3_12dp_bg.xml b/app/src/main/res/drawable/shape_rect_e0dfe3_12dp_bg.xml new file mode 100644 index 00000000..e3dc2298 --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_e0dfe3_12dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rect_white_2dp_bg.xml b/app/src/main/res/drawable/shape_rect_white_2dp_bg.xml new file mode 100644 index 00000000..afc8ff7f --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_white_2dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rect_white_6dp_bg.xml b/app/src/main/res/drawable/shape_rect_white_6dp_bg.xml new file mode 100644 index 00000000..0f8cde0d --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_white_6dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rect_white_8dp_bg.xml b/app/src/main/res/drawable/shape_rect_white_8dp_bg.xml new file mode 100644 index 00000000..0a88b450 --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_white_8dp_bg.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/drawable/shape_rect_white_press_6dp_bg.xml b/app/src/main/res/drawable/shape_rect_white_press_6dp_bg.xml new file mode 100644 index 00000000..9e134891 --- /dev/null +++ b/app/src/main/res/drawable/shape_rect_white_press_6dp_bg.xml @@ -0,0 +1,13 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_right_fragment_bg.xml b/app/src/main/res/drawable/shape_right_fragment_bg.xml new file mode 100644 index 00000000..3dea44be --- /dev/null +++ b/app/src/main/res/drawable/shape_right_fragment_bg.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/shape_zoom_in_bg.xml b/app/src/main/res/drawable/shape_zoom_in_bg.xml new file mode 100644 index 00000000..a0f1d92a --- /dev/null +++ b/app/src/main/res/drawable/shape_zoom_in_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_zoom_in_press_bg.xml b/app/src/main/res/drawable/shape_zoom_in_press_bg.xml new file mode 100644 index 00000000..85a46565 --- /dev/null +++ b/app/src/main/res/drawable/shape_zoom_in_press_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_zoom_out_bg.xml b/app/src/main/res/drawable/shape_zoom_out_bg.xml new file mode 100644 index 00000000..51dfdaac --- /dev/null +++ b/app/src/main/res/drawable/shape_zoom_out_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/drawable/shape_zoom_out_press_bg.xml b/app/src/main/res/drawable/shape_zoom_out_press_bg.xml new file mode 100644 index 00000000..c7283fc9 --- /dev/null +++ b/app/src/main/res/drawable/shape_zoom_out_press_bg.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 1cde83f9..415ee1e6 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -18,7 +18,7 @@ + android:background="@drawable/login_bg"> @@ -99,7 +99,7 @@ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e1d7c190..d61ad0ba 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,6 +6,8 @@ + + @@ -36,6 +38,20 @@ app:layout_constraintTop_toTopOf="parent" /> + + + - + + + android:visibility="invisible" + app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance" /> + - + - + - + - + - + + + + + - - - + - + + - + - - - - - - - - - - - - - - - + + + android:id="@+id/main_activity_select_line" + style="@style/zoom_btns_style" + android:layout_marginBottom="12dp" + android:background="@drawable/selector_road_line_bg" + android:onClick="@{()->mainActivity.selectLineOnclick()}" + android:src="@drawable/selector_road_line_src" + app:layout_constraintBottom_toTopOf="@id/main_activity_voice" + app:layout_constraintRight_toRightOf="@id/main_activity_voice" /> + + diff --git a/app/src/main/res/layout/adapter_offline_map_city.xml b/app/src/main/res/layout/adapter_offline_map_city.xml index 68d56864..a0e19109 100644 --- a/app/src/main/res/layout/adapter_offline_map_city.xml +++ b/app/src/main/res/layout/adapter_offline_map_city.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_below="@id/offline_map_city_name" android:layout_marginTop="5dp" - android:drawableLeft="@mipmap/point_blue" + android:drawableLeft="@drawable/point_blue" android:text="文件大小" android:textColor="@color/gray_121" /> diff --git a/app/src/main/res/layout/adapter_sign.xml b/app/src/main/res/layout/adapter_sign.xml index 53e47432..efcce91b 100644 --- a/app/src/main/res/layout/adapter_sign.xml +++ b/app/src/main/res/layout/adapter_sign.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="193dp" android:layout_height="78dp" - android:background="@mipmap/bg_sign" + android:background="@drawable/bg_sign" tools:context="com.navinfo.omqs.ui.activity.map.SignAdapter"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml index 42ba089a..50771d23 100644 --- a/app/src/main/res/layout/adapter_task_list.xml +++ b/app/src/main/res/layout/adapter_task_list.xml @@ -4,22 +4,31 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" - android:paddingLeft="10dp" - android:paddingTop="5dp" - android:paddingRight="10dp" - android:paddingBottom="5dp" + android:background="@drawable/selector_adapter_item_select_bg" + android:paddingLeft="8dp" + android:paddingTop="6dp" + android:paddingRight="8dp" + android:paddingBottom="4dp" tools:context="com.navinfo.omqs.ui.fragment.tasklist.TaskListAdapter"> + + + android:textColor="#15141F" + android:textSize="14sp" /> + android:textColor="@color/gray_121" + android:textSize="13sp" /> + android:textColor="@color/gray_121" + android:textSize="13sp" /> @@ -59,11 +70,10 @@ @@ -71,11 +81,11 @@ android:id="@+id/task_upload_btn" style="@style/btn_default_stroke_horizontal_round" android:layout_width="wrap_content" - android:minWidth="60dp" android:layout_centerVertical="true" android:layout_marginRight="5dp" android:layout_toLeftOf="@id/task_download_btn" android:gravity="center" + android:minWidth="60dp" android:shadowColor="@android:color/transparent" android:text="同步" android:textSize="@dimen/card_title_font_2size" /> diff --git a/app/src/main/res/layout/connect_out_camera.xml b/app/src/main/res/layout/connect_out_camera.xml index f1443d8d..0e79f412 100644 --- a/app/src/main/res/layout/connect_out_camera.xml +++ b/app/src/main/res/layout/connect_out_camera.xml @@ -17,7 +17,6 @@ android:src="@drawable/icon_camera_close_xml" /> - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_default.xml b/app/src/main/res/layout/dialog_default.xml index eeaacc37..cb5cea89 100644 --- a/app/src/main/res/layout/dialog_default.xml +++ b/app/src/main/res/layout/dialog_default.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:background="@drawable/dialog_bg" + android:background="@drawable/shape_rect_white_2dp_bg" android:orientation="vertical"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_empty.xml b/app/src/main/res/layout/fragment_empty.xml index f59a4d2f..02846634 100644 --- a/app/src/main/res/layout/fragment_empty.xml +++ b/app/src/main/res/layout/fragment_empty.xml @@ -1,7 +1,6 @@ - \ No newline at end of file + tools:context=".ui.fragment.empty.EmptyFragment"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_evaluation_result.xml b/app/src/main/res/layout/fragment_evaluation_result.xml index e9274368..77e477e5 100644 --- a/app/src/main/res/layout/fragment_evaluation_result.xml +++ b/app/src/main/res/layout/fragment_evaluation_result.xml @@ -15,216 +15,212 @@ - + android:layout_marginLeft="12dp" + android:layout_marginTop="14dp" + android:text="Mark" + android:textColor="@color/default_blue_text_color" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - + - + + + + + app:layout_constraintTop_toBottomOf="@id/evaluation_bar_save"> - - - - - + android:layout_marginBottom="7dp" + android:orientation="horizontal"> - + - + - + - + android:layout_marginBottom="7dp" + android:orientation="horizontal"> - + - + - + - + android:layout_marginBottom="7dp" + android:orientation="horizontal"> - + - + - + - + android:layout_marginBottom="7dp" + android:orientation="horizontal"> - + + - + - - - + android:layout_marginBottom="7dp" + android:orientation="horizontal"> + + + + - + - - - - - + android:layout_height="match_parent" + android:orientation="horizontal"> + - + + + + android:layout_marginLeft="8dp" + android:layout_marginTop="26dp" + android:layout_marginBottom="20dp" + android:layout_marginRight="8dp" + android:background="#D6DBF0" /> + android:layout_marginBottom="8dp" + android:text="多媒体" + android:textColor="@color/default_blue_text_color" + android:textSize="16sp" /> - - diff --git a/app/src/main/res/layout/fragment_phenomenon.xml b/app/src/main/res/layout/fragment_phenomenon.xml index 01c3a88d..1f936a86 100644 --- a/app/src/main/res/layout/fragment_phenomenon.xml +++ b/app/src/main/res/layout/fragment_phenomenon.xml @@ -1,63 +1,71 @@ - - + + + + + + + + + + - + - + - + - + + + + + - + + + + - + + + + + + + + - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_problem_link.xml b/app/src/main/res/layout/fragment_problem_link.xml index 5900708e..c5e7a09a 100644 --- a/app/src/main/res/layout/fragment_problem_link.xml +++ b/app/src/main/res/layout/fragment_problem_link.xml @@ -19,7 +19,7 @@ android:paddingTop="30dp" android:paddingRight="10dp" android:paddingBottom="30dp" - android:src="@drawable/btn_back_xml" /> + android:src="@drawable/selector_btn_back_xml" /> + android:src="@drawable/selector_btn_back_xml" /> diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml new file mode 100644 index 00000000..20c2876c --- /dev/null +++ b/app/src/main/res/layout/fragment_task.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml index a2b2a365..3fe6330f 100644 --- a/app/src/main/res/layout/fragment_task_list.xml +++ b/app/src/main/res/layout/fragment_task_list.xml @@ -4,83 +4,49 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_left_pannel" tools:context=".ui.fragment.tasklist.TaskListFragment"> - - + android:layout_height="32dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:background="@drawable/shape_default_inputlayout_white_bg" + android:hint="输入搜索内容" + android:imeOptions="actionDone" + android:paddingLeft="30dp" + android:paddingRight="30dp" + android:singleLine="true" + android:textSize="13sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - + - + + - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/task_list_search" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml new file mode 100644 index 00000000..50f1605e --- /dev/null +++ b/app/src/main/res/layout/fragment_task_manager.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/temp.xml b/app/src/main/res/layout/temp.xml deleted file mode 100644 index 3bce645a..00000000 --- a/app/src/main/res/layout/temp.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/evaluation_bar_mean.xml b/app/src/main/res/menu/evaluation_bar_mean.xml deleted file mode 100644 index c7cfb65f..00000000 --- a/app/src/main/res/menu/evaluation_bar_mean.xml +++ /dev/null @@ -1,18 +0,0 @@ - -

- - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/evaluation_list_bar_mean.xml b/app/src/main/res/menu/evaluation_list_bar_mean.xml deleted file mode 100644 index ae94bd96..00000000 --- a/app/src/main/res/menu/evaluation_list_bar_mean.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index bfbf7214..9e086aa6 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -3,9 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:showIn="navigation_view"> - + - + - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml deleted file mode 100644 index 6f3b755b..00000000 --- a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/app/src/main/res/navigation/left_drawer_nav_graph.xml b/app/src/main/res/navigation/left_drawer_nav_graph.xml index e0b8242c..2e2c94b3 100644 --- a/app/src/main/res/navigation/left_drawer_nav_graph.xml +++ b/app/src/main/res/navigation/left_drawer_nav_graph.xml @@ -2,7 +2,6 @@ + tools:layout="@layout/fragment_task_manager"> diff --git a/app/src/main/res/navigation/middle_fragment_nav_graph.xml b/app/src/main/res/navigation/middle_fragment_nav_graph.xml index 6fd2b7f6..8ff5bb4d 100644 --- a/app/src/main/res/navigation/middle_fragment_nav_graph.xml +++ b/app/src/main/res/navigation/middle_fragment_nav_graph.xml @@ -2,7 +2,6 @@ + 200dp + 54dp + 42dp + 44dp + 41dp + 47dp + 256dp + 230dp + 28dp + + \ No newline at end of file diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml deleted file mode 100644 index d73f4a35..00000000 --- a/app/src/main/res/values-w1240dp/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 200dp - \ No newline at end of file diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml index 22d7f004..ad9117b6 100644 --- a/app/src/main/res/values-w600dp/dimens.xml +++ b/app/src/main/res/values-w600dp/dimens.xml @@ -1,3 +1,4 @@ 48dp + 310dp \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index daafde21..f138c0c1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,14 @@ - #00000000 + + #FFFFFF + #F1EBEB + #4954ED + #6A12C2 + #2631DD + #C1C0C8 + #FFF5F7FE + #dadade #f4f4fc #6c14c4 @@ -9,162 +17,160 @@ #FFFFFF #3c3c44 #aa342c4c - #FFFFFF #e74c3c #342c4c - #303F9F - #FFFFFF - #FFFFF0 - #FFFFE0 - #FFFF00 - #FFFAFA - #FFFAF0 - #FFFACD - #FFF8DC - #FFF5EE - #FFF0F5 - #FFEFD5 - #FFEBCD - #FFE4E1 - #FFE4C4 - #FFE4B5 - #FFDEAD - #FFDAB9 - #FFD700 - #FFC0CB - #FFB6C1 + + + + + + + + + + + + + + + + + + + + + #FFA500 - #FFA07A - #FF8C00 - #FF7F50 - #FF69B4 - #FF6347 - #FF4500 - #FF1493 - #FF00FF - #FF00FF + + + + + + + + + #FF0000 - #FDF5E6 - #FAFAD2 - #FAF0E6 - #FAEBD7 - #FA8072 - #F8F8FF - #F5FFFA - #F5F5F5 - #F5F5DC - #F5DEB3 - #F4A460 - #F0FFFF - #F0FFF0 - #F0F8FF - #F0E68C - #F08080 - #EEE8AA - #EE82EE - #E9967A - #E6E6FA - #E0FFFF - #DEB887 - #DDA0DD - #DCDCDC - #DC143C - #DB7093 - #DAA520 - #DA70D6 - #D8BFD8 - #D3D3D3 - #D3D3D3 - #D2B48C - #D2691E - #CD853F - #CD5C5C - #C71585 - #C0C0C0 - #BDB76B - #BC8F8F - #BA55D3 - #B8860B - #B22222 - #B0E0E6 - #B0C4DE - #AFEEEE - #ADFF2F - #ADD8E6 - #A9A9A9 - #A9A9A9 - #A52A2A - #A0522D - #9932CC - #98FB98 - #9400D3 - #9370DB - #90EE90 - #8FBC8F - #8B4513 - #8B008B - #8B0000 - #8A2BE2 - #87CEFA - #87CEEB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #808080 - #808080 - #808000 - #800080 - #800000 - #7FFFD4 - #7FFF00 - #7CFC00 - #7B68EE - #778899 - #778899 - #708090 - #708090 - #6B8E23 - #6A5ACD - #696969 - #696969 - #66CDAA - #6495ED - #5F9EA0 - #556B2F - #4B0082 - #48D1CC - #483D8B - #4682B4 - #4169E1 - #40E0D0 - #3CB371 - #32CD32 - #2F4F4F - #2F4F4F - #2E8B57 - #228B22 - #20B2AA - #1E90FF - #191970 - #00FFFF - #00FFFF - #00FF7F - #00FF00 - #00FA9A - #00CED1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #00BFFF - #008B8B - #008080 - #008000 - #006400 + + + + #0000FF - #0000CD - #00008B - #000080 + + + #000000 #999999 #FF3B30 - #108ee9 #2631DD - #FFF5F7FE + #000000 #FF4263EB @@ -172,7 +178,6 @@ #999999 #797979 - #595959 #FF3266F1 #c1c1c1 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 60098140..acc41e1d 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,20 +11,11 @@ 24sp 13sp 10sp - 1dp - 2dp 3dp - 4dp 5dp - 6dp 8dp - 9dp 10dp 12dp - 14dp - 15dp - 16dp - 18dp 20dp 22dp 24dp @@ -38,4 +29,16 @@ 75dp 48dp 36dp + + 310dp + 54dp + 42dp + 44dp + 41dp + 47dp + 213dp + 230dp + 28dp + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f17ca50..f573b422 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,24 +1,13 @@ LandScope - Settings 个人中心 - Second Fragment - Next - Previous 请输入用户名 请输入密码 登录 注册 imageDescription - Open navigation drawer - Close navigation drawer - Android Studio Navinfo Mobile - Navigation header - Home - Gallery - Slideshow \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 19a23744..014fb4ae 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,34 +24,63 @@ - - - - - + + + + + + + + + + + + @@ -73,15 +102,6 @@ - - - - - + + diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt index 7430050d..3bfc9084 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/HadLinkDvoBean.kt @@ -14,6 +14,11 @@ open class HadLinkDvoBean @JvmOverloads constructor( /** * (几何)加偏后 */ - var geometry: String = "" + var geometry: String = "", + + /** + * 不作业原因 + */ + var reason: String = "" ) : RealmObject() \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt index 8862097d..df4fd714 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt @@ -3,6 +3,7 @@ package com.navinfo.collect.library.map.handler import android.content.Context import androidx.appcompat.app.AppCompatActivity import com.navinfo.collect.library.map.NIMapView +import org.oscim.core.BoundingBox import org.oscim.core.GeoPoint import org.oscim.core.MapPosition @@ -68,4 +69,11 @@ open class AnimationHandler(context: AppCompatActivity, mapView: NIMapView) : mMapView.vtmMap.animator().animateTo(mapPosition) } + /** + * + */ + fun animateToBox(maxX: Double, maxY: Double, minX: Double, minY: Double) { + val box = BoundingBox(minY, minX, maxY, maxX) + mMapView.vtmMap.animator().animateTo(box) + } } \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt index ceb72990..ba4ed19b 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt @@ -16,17 +16,41 @@ import org.oscim.map.Map class OmdbTaskLinkLayer(map: Map, private var style: Style) : VectorLayer(map) { private val lineMap = HashMap() + private var selectDrawable: Drawable? = null + + private val selectStyle = + Style.builder().fillColor(Color.GREEN).strokeColor(Color.GREEN) + .strokeWidth(10f).fixed(false).build() + + + @Synchronized fun addLine(hadLinkDvoBean: HadLinkDvoBean, style: Style = this.style) { - hadLinkDvoBean.let { - if (!lineMap.containsKey(it.linkPid)) { - // 添加geometry到图层上 - val lineDrawable = LineDrawable(GeometryTools.createGeometry(it.geometry), style) - super.add(lineDrawable) - lineMap[it.linkPid] = lineDrawable - } + if (!lineMap.containsKey(hadLinkDvoBean.linkPid)) { + // 添加geometry到图层上 + val lineDrawable = + LineDrawable(GeometryTools.createGeometry(hadLinkDvoBean.geometry), style) + super.add(lineDrawable) + lineMap[hadLinkDvoBean.linkPid] = lineDrawable } } + @Synchronized + fun showSelectLine(hadLinkDvoBean: HadLinkDvoBean) { + if (selectDrawable != null) super.remove(selectDrawable) + selectDrawable = + LineDrawable(GeometryTools.createGeometry(hadLinkDvoBean.geometry), selectStyle) + super.add(selectDrawable) + } + + @Synchronized + fun clearSelectLine() { + if (selectDrawable != null) { + super.remove(selectDrawable) + selectDrawable = null + } + } + + @Synchronized fun addLineList(hadLinkDvoBeanList: List, style: Style = this.style) { hadLinkDvoBeanList.forEach { addLine(it, style) @@ -48,18 +72,17 @@ class OmdbTaskLinkLayer(map: Map, private var style: Style) : VectorLayer(map) { @RequiresApi(Build.VERSION_CODES.O) fun setLineColor(color: Color) { - this.style = Style.builder() - .fillColor(color.toArgb()) - .fillAlpha(0.5f) - .strokeColor(color.toArgb()) - .strokeWidth(8f) - .fixed(true).build() + this.style = + Style.builder().fillColor(color.toArgb()).fillAlpha(0.5f).strokeColor(color.toArgb()) + .strokeWidth(8f).fixed(true).build() } + @Synchronized fun removeAll() { for ((key, value) in lineMap) { super.remove(value) } lineMap.clear() + clearSelectLine() } } \ No newline at end of file diff --git a/collect-library/src/main/res/drawable/bg_nimap_default_button.xml b/collect-library/src/main/res/drawable/bg_nimap_default_button.xml deleted file mode 100644 index 03131b04..00000000 --- a/collect-library/src/main/res/drawable/bg_nimap_default_button.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/collect-library/src/main/res/drawable/shape_button_default.xml b/collect-library/src/main/res/drawable/shape_button_default.xml deleted file mode 100644 index 4115cff3..00000000 --- a/collect-library/src/main/res/drawable/shape_button_default.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/collect-library/src/main/res/drawable/shape_button_press.xml b/collect-library/src/main/res/drawable/shape_button_press.xml deleted file mode 100644 index 4a97beab..00000000 --- a/collect-library/src/main/res/drawable/shape_button_press.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/collect-library/src/main/res/layout/base_map_layout.xml b/collect-library/src/main/res/layout/base_map_layout.xml index 27ec2c2b..f0f6ea9e 100644 --- a/collect-library/src/main/res/layout/base_map_layout.xml +++ b/collect-library/src/main/res/layout/base_map_layout.xml @@ -34,6 +34,7 @@ android:layout_alignParentBottom="true" android:layout_marginRight="20dp" android:layout_marginBottom="48dp" + android:visibility="gone" android:background="@drawable/map_zoom_bg_xml" android:orientation="vertical" android:padding="@dimen/nimap_defalut_padding"> diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_direction.png b/collect-library/src/main/res/mipmap-hdpi/icon_direction.png deleted file mode 100644 index b2be8682879be5392321f5304197b0614cd4d487..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4823 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 diff --git a/collect-library/src/main/res/mipmap-hdpi/icon_direction_p.png b/collect-library/src/main/res/mipmap-hdpi/icon_direction_p.png deleted file mode 100644 index 19502a6c49bcf6588be659ce30b5b02250a39b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4569 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 AO8@`> diff --git a/collect-library/src/main/res/values/colors.xml b/collect-library/src/main/res/values/colors.xml index f3277d08..8adbf2e8 100644 --- a/collect-library/src/main/res/values/colors.xml +++ b/collect-library/src/main/res/values/colors.xml @@ -1,20 +1,13 @@ #00000000 - #FFBB86FC - #FF6200EE - #FF3700B3 #FF03DAC5 - #FF018786 #FF000000 #FFFFFFFF #00FFFFFF - #ffffffff #028FFF #4E55AF #FFF6565D - #4E55AF - #1890ff #F03736 \ No newline at end of file diff --git a/collect-library/src/main/res/values/themes.xml b/collect-library/src/main/res/values/themes.xml index 498406b3..69a9dc49 100644 --- a/collect-library/src/main/res/values/themes.xml +++ b/collect-library/src/main/res/values/themes.xml @@ -1,16 +1,3 @@ - \ No newline at end of file