diff --git a/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml b/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml index 282105a721..295f98317b 100644 --- a/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml +++ b/modules/mogo-module-navi/src/main/res/layout/fragment_search.xml @@ -13,31 +13,183 @@ > + + - - + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml b/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml index fe43a9d083..ddff59b03a 100644 --- a/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml +++ b/modules/mogo-module-navi/src/main/res/layout/item_search_poi.xml @@ -1,58 +1,57 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_90" + > - - android:background="#802D3256" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" /> - - + - - android:textSize="30sp" - app:layout_constraintLeft_toRightOf="@id/iv_position" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - + \ No newline at end of file diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png new file mode 100755 index 0000000000..47782f77f5 Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_company.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png new file mode 100755 index 0000000000..0ae97b36d1 Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_gas.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png new file mode 100755 index 0000000000..e1a918fa24 Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_home.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png new file mode 100755 index 0000000000..be529a46a3 Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_location.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png new file mode 100755 index 0000000000..161e1137bf Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_park.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png new file mode 100755 index 0000000000..44f01d1337 Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_restrant.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png new file mode 100755 index 0000000000..9db11f18bb Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_setting.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png new file mode 100755 index 0000000000..d8e3d9e3bd Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_tolit.png differ diff --git a/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png new file mode 100755 index 0000000000..8064743c9b Binary files /dev/null and b/modules/mogo-module-navi/src/main/res/mipmap-xhdpi/icon_navi_wash.png differ diff --git a/modules/mogo-module-navi/src/main/res/values/colors.xml b/modules/mogo-module-navi/src/main/res/values/colors.xml index 95d44677b1..9034eeceb2 100644 --- a/modules/mogo-module-navi/src/main/res/values/colors.xml +++ b/modules/mogo-module-navi/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ #D81B60 #ff080625 #FFFFFF + #1AFFFFFF #99FFFFFF #7FFFFFFF #00BFFF @@ -12,5 +13,6 @@ #4D080625 #080625 + #3E7FFC diff --git a/modules/mogo-module-navi/src/main/res/values/dimens.xml b/modules/mogo-module-navi/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..a3ee6f7620 --- /dev/null +++ b/modules/mogo-module-navi/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + @dimen/sp_16 + \ No newline at end of file diff --git a/modules/mogo-module-navi/src/main/res/values/strings.xml b/modules/mogo-module-navi/src/main/res/values/strings.xml index ac37e0a964..30e397bbaa 100644 --- a/modules/mogo-module-navi/src/main/res/values/strings.xml +++ b/modules/mogo-module-navi/src/main/res/values/strings.xml @@ -1,4 +1,8 @@ mogo-module-navi 查看地点、公交、地铁 + 搜索历史 + 回家 + 去公司 + 餐馆 diff --git a/modules/mogo-module-navi/src/main/res/values/styles.xml b/modules/mogo-module-navi/src/main/res/values/styles.xml index 624c3162ae..d30e008efe 100644 --- a/modules/mogo-module-navi/src/main/res/values/styles.xml +++ b/modules/mogo-module-navi/src/main/res/values/styles.xml @@ -16,4 +16,13 @@ 48dp + + diff --git a/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java b/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java new file mode 100644 index 0000000000..3a4d4d42eb --- /dev/null +++ b/modules/mogo-module-navi/src/test/java/com/mogo/module/navi/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.mogo.module.navi; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file