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 @@ + + + + + + + + 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 @@ + @@ -11,13 +12,23 @@ - + + + + + + + + + + + @@ -25,7 +36,8 @@ - + + 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 @@ + + + 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 @@ + + + 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 @@ + + + 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 @@ + + + + + + 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 @@ + + + + + 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 @@ + + + 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" /> @@ -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" /> + android:theme="@style/Theme.AppCompat.Light"> + app:srcCompat="@mipmap/logo" /> \ 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 bbf5b357..54fa580b 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="离线地图" /> 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 @@ 75dp 48dp + 6dp \ 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 @@ Open navigation drawer Close navigation drawer Android Studio - android.studio@android.com + Navinfo Mobile Navigation header Home diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3beb0530..fe92ac61 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -94,14 +94,15 @@ false -