diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png new file mode 100644 index 0000000000..1775865c65 Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 5f48333a3d..1c6818a53e 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -6,7 +6,7 @@ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml index bf93b2e4a2..a3259e0e51 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml @@ -1,257 +1,280 @@ - + android:background="@drawable/bus_p_right_route_bg"> - + android:layout_marginTop="@dimen/dp_10" + android:layout_marginRight="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" + app:bgColor="#00000000" + app:blurRadius="@dimen/dp_28" + app:shadowColor="#45688AE1" + app:shadowRadius="@dimen/dp_40" + app:shadow_position="outer" + app:xOffset="0dp" + app:yOffset="0dp"/> - - - - - + app:roundLayoutRadius="@dimen/dp_40"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintBottom_toTopOf="@+id/busPLineMapView" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + - - - - - + app:layout_constraintRight_toRightOf="parent" /> - + - + - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml index 4c89553bba..be3ef80d2f 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml @@ -1,6 +1,7 @@ 750dp + 886dp 40dp 40dp 48dp diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png new file mode 100644 index 0000000000..1775865c65 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 9f240c07a4..fd82758d1c 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -7,11 +7,11 @@ + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> - + android:background="@drawable/bus_p_right_route_bg"> - + android:layout_marginTop="@dimen/dp_10" + android:layout_marginRight="@dimen/dp_10" + android:layout_marginBottom="@dimen/dp_10" + app:bgColor="#00000000" + app:blurRadius="@dimen/dp_28" + app:shadowColor="#45688AE1" + app:shadowRadius="@dimen/dp_40" + app:shadow_position="outer" + app:xOffset="0dp" + app:yOffset="0dp"/> - + app:roundLayoutRadius="@dimen/dp_40"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintBottom_toTopOf="@+id/bus_p_line_map_view" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - \ No newline at end of file + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml index 866eb98881..6af24a02bf 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml @@ -1,6 +1,7 @@ 750dp + 886dp 40dp 40dp 48dp