From 0255b0ea84c6012294d34cc025aea66b98e5ba91 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Sat, 6 May 2023 14:58:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=A6=E4=BE=A7?=
=?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../selector_default_primary_press_secondary.xml | 8 ++++++++
.../res/drawable/fm_card_map_down_status_bg.xml | 16 ++++++++++++++--
.../ic_baseline_format_list_bulleted_24.xml | 5 +++++
.../ic_baseline_generating_tokens_24.xml | 5 +++++
.../main/res/drawable/ic_baseline_layers_24.xml | 5 +++++
.../ic_baseline_playlist_add_check_24.xml | 8 ++++++++
.../res/drawable/ic_baseline_scatter_plot_24.xml | 7 +++++++
.../ic_baseline_sim_card_download_24.xml | 5 +++++
.../main/res/layout/adapter_offline_map_city.xml | 1 -
app/src/main/res/layout/adapter_task_list.xml | 15 ++++++++-------
app/src/main/res/layout/personal_center_head.xml | 13 ++++++++-----
app/src/main/res/menu/personal_center_menu.xml | 15 +++++++++------
app/src/main/res/values/dimens.xml | 1 +
app/src/main/res/values/strings.xml | 2 +-
app/src/main/res/values/styles.xml | 5 +++--
15 files changed, 87 insertions(+), 24 deletions(-)
create mode 100644 app/src/main/res/color/selector_default_primary_press_secondary.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_layers_24.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml
create mode 100644 app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml
diff --git a/app/src/main/res/color/selector_default_primary_press_secondary.xml b/app/src/main/res/color/selector_default_primary_press_secondary.xml
new file mode 100644
index 00000000..7575e953
--- /dev/null
+++ b/app/src/main/res/color/selector_default_primary_press_secondary.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_enabled="false" android:color="@color/gray"/>
+ <item android:state_checked="true" android:color="@color/colorSecondary"></item>
+ <item android:state_selected="true" android:color="@color/colorSecondary"></item>
+ <item android:state_pressed="true" android:color="@color/colorSecondary"></item>
+ <item android:color="@color/colorPrimary"></item>
+</selector>
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
index 10796f89..25e52a9f 100644
--- 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
@@ -4,6 +4,7 @@
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/cv_gray_153" />
+ <corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cv_gray_153" />
</shape>
</item>
@@ -11,13 +12,23 @@
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/white" />
- <stroke android:width="1.1dp" android:color="@color/white" />
+ <corners android:radius="@dimen/default_btn_corner"></corners>
+ <stroke android:width="1.1dp" android:color="@color/colorSecondary" />
+ </shape>
+ </item>
+ <item android:state_checked="true">
+ <shape>
+ <padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
+ <solid android:color="@color/white" />
+ <corners android:radius="@dimen/default_btn_corner"></corners>
+ <stroke android:width="1.1dp" android:color="@color/colorSecondary" />
</shape>
</item>
<item android:state_selected="true">
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/cvm_red" />
+ <corners android:radius="@dimen/default_btn_corner"></corners>
<stroke android:width="1.1dp" android:color="@color/cvm_red" />
</shape>
</item>
@@ -25,7 +36,8 @@
<shape>
<padding android:bottom="@dimen/default_widget_padding" android:left="@dimen/default_widget_padding" android:right="@dimen/default_widget_padding" android:top="@dimen/default_widget_padding"></padding>
<solid android:color="@color/transp" />
- <stroke android:width="1.1dp" android:color="@color/btn_blue_solid" />
+ <corners android:radius="@dimen/default_btn_corner"></corners>
+ <stroke android:width="1.1dp" android:color="@color/colorPrimary" />
</shape>
</item>
diff --git a/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml b/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml
new file mode 100644
index 00000000..2952de2c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_format_list_bulleted_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:tint="#2C2C2C" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml b/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml
new file mode 100644
index 00000000..d597b5c1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_generating_tokens_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M9,4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8C17,7.58 13.42,4 9,4zM12,10.5h-2v5H8v-5H6V9h6V10.5zM20.25,3.75L23,5l-2.75,1.25L19,9l-1.25,-2.75L15,5l2.75,-1.25L19,1L20.25,3.75zM20.25,17.75L23,19l-2.75,1.25L19,23l-1.25,-2.75L15,19l2.75,-1.25L19,15L20.25,17.75z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_layers_24.xml b/app/src/main/res/drawable/ic_baseline_layers_24.xml
new file mode 100644
index 00000000..96af88aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_layers_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml b/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml
new file mode 100644
index 00000000..d45fbc72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_playlist_add_check_24.xml
@@ -0,0 +1,8 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:tint="#2C2C2C" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M3,10h11v2h-11z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M3,6h11v2h-11z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M3,14h7v2h-7z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M20.59,11.93l-4.25,4.24l-2.12,-2.12l-1.41,1.41l3.53,3.54l5.66,-5.66z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml b/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml
new file mode 100644
index 00000000..9460121e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_scatter_plot_24.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M7,14m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+ <path android:fillColor="@android:color/white" android:pathData="M11,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+ <path android:fillColor="@android:color/white" android:pathData="M16.6,17.6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml b/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml
new file mode 100644
index 00000000..9e5481d6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_sim_card_download_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#2C2C2C"
+ android:viewportHeight="24" android:viewportWidth="24"
+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M18,2h-8L4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C20,2.9 19.1,2 18,2zM12,17l-4,-4h3V9.02L13,9v4h3L12,17z"/>
+</vector>
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 21e0e6f9..c8516621 100644
--- a/app/src/main/res/layout/adapter_offline_map_city.xml
+++ b/app/src/main/res/layout/adapter_offline_map_city.xml
@@ -39,7 +39,6 @@
android:layout_alignParentRight="true"
android:shadowColor="@android:color/transparent"
android:text="下载"
- android:textColor="@color/btn_blue_solid"
android:textSize="@dimen/card_title_font_2size" />
<TextView
diff --git a/app/src/main/res/layout/adapter_task_list.xml b/app/src/main/res/layout/adapter_task_list.xml
index fcd684a7..386f29d4 100644
--- a/app/src/main/res/layout/adapter_task_list.xml
+++ b/app/src/main/res/layout/adapter_task_list.xml
@@ -17,7 +17,8 @@
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/task_download_btn"
android:text="任务名称"
- android:textColor="@color/white"
+ android:textStyle="bold"
+ android:textColor="@color/black"
android:textSize="@dimen/default_font_size" />
<TextView
@@ -27,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/task_name"
android:layout_marginTop="5dp"
+ android:textColor="@color/gray_121"
android:text="省市名称"
android:textSize="@dimen/card_title_font_3size" />
@@ -35,9 +37,10 @@
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/task_city_name"
- android:layout_alignTop="@id/task_city_name"
- android:layout_marginLeft="5dp"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/task_upload_btn"
+ android:layout_below="@id/task_city_name"
+ android:textColor="@color/gray_121"
android:text="版本号"
android:textSize="@dimen/card_title_font_3size" />
@@ -46,7 +49,7 @@
style="@style/map_size_font_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/task_city_name"
+ android:layout_below="@id/task_data_version"
android:layout_marginTop="5dp"
android:drawableLeft="@mipmap/point_blue"
android:text="路线颜色"
@@ -62,7 +65,6 @@
android:gravity="center"
android:shadowColor="@android:color/transparent"
android:text="下载"
- android:textColor="@color/btn_blue_solid"
android:textSize="@dimen/card_title_font_2size" />
<TextView
@@ -76,7 +78,6 @@
android:gravity="center"
android:shadowColor="@android:color/transparent"
android:text="同步"
- android:textColor="@color/btn_blue_solid"
android:textSize="@dimen/card_title_font_2size" />
<TextView
diff --git a/app/src/main/res/layout/personal_center_head.xml b/app/src/main/res/layout/personal_center_head.xml
index 7b3e03f6..d0f24845 100644
--- a/app/src/main/res/layout/personal_center_head.xml
+++ b/app/src/main/res/layout/personal_center_head.xml
@@ -3,33 +3,36 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
- android:background="@color/blue"
+ android:background="@color/colorPrimary"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
- android:theme="@style/ThemeOverlay.AppCompat.Dark">
+ android:theme="@style/Theme.AppCompat.Light">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:contentDescription="@string/nav_header_desc"
+ android:contentDescription="@string/app_name"
android:paddingTop="@dimen/nav_header_vertical_spacing"
- app:srcCompat="@mipmap/ic_launcher_round" />
+ app:srcCompat="@mipmap/logo" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
- android:text="@string/nav_header_title"
+ android:text="@string/app_name"
+ style="@style/TextAppearance.AppCompat.Title"
+ android:textColor="@color/white"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:textColor="@color/line_gray"
android:text="@string/nav_header_subtitle" />
</LinearLayout>
\ 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 3bd6f840..99808163 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -12,19 +12,21 @@
android:title="离线地图" />
<item
android:id="@+id/personal_center_menu_obtain_data"
- android:icon="@drawable/ic_baseline_import_export_24"
+ android:icon="@drawable/ic_baseline_generating_tokens_24"
+ android:visible="false"
android:title="生成数据" />
<item
android:id="@+id/personal_center_menu_import_data"
android:icon="@drawable/ic_baseline_import_export_24"
+ android:visible="false"
android:title="导入数据" />
<item
android:id="@+id/personal_center_menu_import_yuan_data"
- android:icon="@drawable/ic_baseline_import_export_24"
+ android:icon="@drawable/ic_baseline_scatter_plot_24"
android:title="导入元数据" />
<item
android:id="@+id/personal_center_menu_realm_data_backup"
- android:icon="@drawable/ic_baseline_import_export_24"
+ android:icon="@drawable/ic_baseline_sim_card_download_24"
android:title="备份数据" />
</group>
<group
@@ -34,20 +36,21 @@
<menu>
<item
android:id="@+id/personal_center_menu_task_list"
- android:icon="@drawable/baseline_person_24"
+ android:icon="@drawable/ic_baseline_format_list_bulleted_24"
android:title="任务列表" />
<item
android:id="@+id/personal_center_menu_qs_record_list"
- android:icon="@drawable/baseline_person_24"
+ android:icon="@drawable/ic_baseline_playlist_add_check_24"
android:title="我的数据" />
<item
android:id="@+id/personal_center_menu_layer_manager"
- android:icon="@drawable/baseline_person_24"
+ android:icon="@drawable/ic_baseline_layers_24"
android:title="图层管理" />
<item
android:id="@+id/personal_center_menu_test"
android:icon="@drawable/baseline_person_24"
+ android:visible="false"
android:title="测试" />
</menu>
</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d55153f0..e8059a21 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -37,4 +37,5 @@
<!-- 相机设置窗体IV高度-->
<dimen name="camear_dialog_iv_hight" comment="相机设置窗体高度">75dp</dimen>
<dimen name="head_img_width">48dp</dimen>
+ <dimen name="default_btn_corner">6dp</dimen>
</resources>
\ 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 c6bf628b..9f17ca50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="nav_header_title">Android Studio</string>
- <string name="nav_header_subtitle">android.studio@android.com</string>
+ <string name="nav_header_subtitle">Navinfo Mobile</string>
<string name="nav_header_desc">Navigation header</string>
<string name="menu_home">Home</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3299be77..38a30ec9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -85,14 +85,15 @@
<item name="android:clickable">false</item>
</style>
- <style name="map_download_style_btn" comment="离线地图下载的按钮样式">
+ <style name="map_download_style_btn" comment="离线地图下载的按钮样式" parent="ThemeOverlay.Material3.AutoCompleteTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:padding">@dimen/default_widget_padding</item>
<item name="android:background">@drawable/fm_card_map_down_status_bg</item>
+ <item name="android:foreground">@drawable/ripple_btn_press</item>
<item name="android:gravity">center_horizontal</item>
- <item name="android:textColor">@color/btn_blue_white</item>
+ <item name="android:textColor">@color/selector_default_primary_press_secondary</item>
<item name="android:textSize">15sp</item>
</style>