diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index ea81073522..d5e7a79308 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -30,13 +30,13 @@ public class LaucherShareDialog extends Dialog implements View.OnClickListener { public LaucherShareDialog(@NonNull Context context) { - super(context); + super(context, R.style.BottomDialog); this.mContext = context; getWindow().setBackgroundDrawableResource(android.R.color.transparent); } public LaucherShareDialog(@NonNull Context context, int themeResId) { - super(context, R.style.Theme_AppCompat_Dialog); + super(context, R.style.BottomDialog); } @Override diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png new file mode 100644 index 0000000000..ab5e22a384 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png new file mode 100644 index 0000000000..5ef357ce54 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_oil_price.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png new file mode 100644 index 0000000000..0e20d530b5 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png new file mode 100644 index 0000000000..3fe74d1514 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml index 2d9b08d3c1..2e9efefec9 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml @@ -1,21 +1,21 @@ + android:textSize="@dimen/share_module_title_content" /> + android:layout_marginTop="@dimen/share_module_margin_top"> + android:layout_marginLeft="@dimen/share_module_first_margin_left"> @@ -54,25 +54,25 @@ android:id="@+id/oil_price_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/btn_block_layout"> @@ -80,25 +80,25 @@ android:id="@+id/traffic_check_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/oil_price_layout"> @@ -106,25 +106,25 @@ android:id="@+id/road_closure_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_120" + android:layout_marginLeft="@dimen/share_module_margin_left" android:layout_toRightOf="@+id/traffic_check_layout"> @@ -133,11 +133,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/btn_block_layout" - android:layout_marginTop="@dimen/dp_55" + android:layout_marginTop="@dimen/share_module_bottom_margin_top" android:gravity="center" android:text="可以对小智说:分享拥堵、分享油价、分享查车、分享封路" android:textColor="@color/white_40" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/share_module_bottom_size" android:textStyle="bold" /> diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..da65c676db --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml @@ -0,0 +1,19 @@ + + + + 693px + 320px + 34px + 43px + 80px + 64px + 15px + 85px + 28px + + + 22px + 18px + 15px + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..8e1edc4724 --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml @@ -0,0 +1,20 @@ + + + 1300px + 600px + 64px + 80px + 150px + 120px + 30px + 160px + 55px + + + 40px + 32px + 28px + + + + diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml index ebf7824990..d6a88ad3d2 100644 --- a/modules/mogo-module-share/src/main/res/values/colors.xml +++ b/modules/mogo-module-share/src/main/res/values/colors.xml @@ -16,5 +16,6 @@ #666666 #999999 #000000 + #00FFFFFF diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..8e1edc4724 --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values/dimens.xml @@ -0,0 +1,20 @@ + + + 1300px + 600px + 64px + 80px + 150px + 120px + 30px + 160px + 55px + + + 40px + 32px + 28px + + + + diff --git a/modules/mogo-module-share/src/main/res/values/styles.xml b/modules/mogo-module-share/src/main/res/values/styles.xml new file mode 100644 index 0000000000..389862f71e --- /dev/null +++ b/modules/mogo-module-share/src/main/res/values/styles.xml @@ -0,0 +1,16 @@ + + + + diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 78aa080e47..48a00d3b8d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -18,6 +18,7 @@ #A2A2A2 #5a979797 #80FFFFFF + #00FFFFFF #b3000000 #0DFFFFFF #000000 diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..bc6de92c91 --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -0,0 +1,52 @@ + + + + + 106px + 106px + 48px + 48px + 72px + 5px + + 106px + 106px + 96px + 96px + 144px + 760px + 10px + + 135px + 50px + 50px + 30px + 92px + 40px + 800px + + 660px + 24px + 58px + 8px + 2px + 613px + 355px + 20px + 300px + 90px + 75px + 205px + 25px + + + 38px + 26px + 34px + 26px + 28px + + + + +