diff --git a/.idea/misc.xml b/.idea/misc.xml index b1359dcf73..af014f4e05 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,6 +27,8 @@ + + diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_backgroud.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_item_backgroud.xml deleted file mode 100644 index 54f571d1e5..0000000000 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_item_backgroud.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml index 0d24d54394..a70936cd5d 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml @@ -1,7 +1,11 @@ - + + - diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background_origin.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background_origin.xml new file mode 100644 index 0000000000..0d24d54394 --- /dev/null +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background_origin.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml index 2fe587fe28..f6375db0f6 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/module_push_ui_height" - android:background="@drawable/module_push_item_backgroud"> + android:layout_marginTop="@dimen/module_push_ui_margin_top" + android:background="@drawable/module_push_item_background"> + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml index f42acaf28d..d7829a2fb7 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/module_push_ui_width_vertical" android:layout_height="wrap_content" - android:background="@drawable/module_push_item_background" + android:background="@drawable/module_push_item_background_origin" android:maxHeight="@dimen/module_push_item_maxHeight_vertical" android:orientation="vertical" android:paddingLeft="@dimen/module_push_ui_app_icon_leftMargin_vertical" diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml index afd2948b13..4afc379245 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -34,5 +34,6 @@ 1000px 33px 43px + 20px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml index c958b53e35..dc5f0d6635 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -122,4 +122,5 @@ 1000px 33px 43px + 20px \ No newline at end of file