diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png index 957c298fd6..5480b6d165 100644 Binary files a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png differ diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml index 7ae04a2bed..1520ad601e 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml @@ -4,10 +4,10 @@ + android:bottom="@dimen/tanlu_module_shade_size" + android:left="@dimen/tanlu_module_shade_size" + android:right="@dimen/tanlu_module_shade_size" + android:top="@dimen/tanlu_module_shade_size" /> @@ -15,10 +15,10 @@ + android:bottom="@dimen/tanlu_module_shade_size" + android:left="@dimen/tanlu_module_shade_size" + android:right="@dimen/tanlu_module_shade_size" + android:top="@dimen/tanlu_module_shade_size" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml index 7716b8ccc7..2a32aa9897 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -80,16 +80,17 @@ 186px 176px 250px - 172px + 158px 45px 13px - 8px - 7px + 6px + 13px 17px 3px 18px 26px + 4px 28px 56px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index 4062891c80..969d398b55 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -90,6 +90,7 @@ 9px 27px 46px + 4px 50px 90px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index 88af7354b4..1676116d31 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -90,6 +90,7 @@ 9px 27px 46px + 4px 50px 98px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index 7716b8ccc7..2a32aa9897 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -80,16 +80,17 @@ 186px 176px 250px - 172px + 158px 45px 13px - 8px - 7px + 6px + 13px 17px 3px 18px 26px + 4px 28px 56px diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index b516dedff0..b524ced9c9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -12,7 +12,7 @@ android:id="@+id/viewLinStart" android:layout_width="wrap_content" android:layout_height="1px" - android:background="#979797" + android:background="@color/share_event_no_more_color" app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip" app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip" app:layout_constraintStart_toStartOf="parent" @@ -35,7 +35,7 @@ android:id="@+id/viewLinEnd" android:layout_width="wrap_content" android:layout_height="1px" - android:background="#979797" + android:background="@color/share_event_no_more_color" app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip" diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png new file mode 100644 index 0000000000..d6aeb4ec4f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png new file mode 100644 index 0000000000..d6aeb4ec4f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png new file mode 100644 index 0000000000..8968f0595c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png new file mode 100644 index 0000000000..8968f0595c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml index afd05b86dd..94999dc002 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml @@ -4,10 +4,10 @@ + android:bottom="@dimen/tanlu_module_shade_size_l" + android:left="@dimen/tanlu_module_shade_size_l" + android:right="@dimen/tanlu_module_shade_size_l" + android:top="@dimen/tanlu_module_shade_size_l" /> @@ -15,10 +15,10 @@ + android:bottom="@dimen/tanlu_module_shade_size_l" + android:left="@dimen/tanlu_module_shade_size_l" + android:right="@dimen/tanlu_module_shade_size_l" + android:top="@dimen/tanlu_module_shade_size_l" /> diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..3a2df8bb23 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml @@ -0,0 +1,8 @@ + + + 16px + 10px + 8px + 4px + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml index 9514cc43b3..b51d728283 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml @@ -3,6 +3,7 @@ 30px 20px 16px + 4px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml index b22064a243..9def827f0f 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml @@ -4,6 +4,7 @@ 30px 20px 16px + 4px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml index 6a87855ba7..3a2df8bb23 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml @@ -3,5 +3,6 @@ 16px 10px 8px + 4px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 4eb258787e..21bd14ebf9 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -8,7 +8,7 @@ #333333 #FFFFFF #FFFFFF - #CB333333 + #80333333 #999999 #B2333333 #666666