diff --git a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml b/modules/mogo-module-share/src/main/res/drawable/module_share_dialog_bg.xml
similarity index 100%
rename from modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml
rename to modules/mogo-module-share/src/main/res/drawable/module_share_dialog_bg.xml
diff --git a/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml
index c732a3e2e5..d17fe7fc18 100644
--- a/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml
+++ b/modules/mogo-module-share/src/main/res/layout/item_share_btn.xml
@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:id="@+id/tvShareContent"
android:text="上报拥堵"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:textSize="@dimen/share_module_item"
android:textStyle="bold" />
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 3e9ca3ab44..dae881e4e8 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
@@ -13,7 +13,7 @@
android:clickable="true"
android:focusable="true"
android:layout_gravity="center"
- android:background="@drawable/shape_bg_222533_20px">
+ android:background="@drawable/module_share_dialog_bg">
@@ -56,7 +56,7 @@
android:layout_marginTop="@dimen/share_module_tv_margin_top"
android:gravity="center"
android:text="上报拥堵"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:textSize="@dimen/share_module_item"
android:textStyle="bold" />
@@ -83,7 +83,7 @@
android:layout_marginTop="@dimen/share_module_tv_margin_top"
android:gravity="center"
android:text="分享油价"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:textSize="@dimen/share_module_item"
android:textStyle="bold" />
@@ -109,7 +109,7 @@
android:layout_marginTop="@dimen/share_module_tv_margin_top"
android:gravity="center"
android:text="上报交通检查"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:textSize="@dimen/share_module_item"
android:textStyle="bold" />
@@ -135,7 +135,7 @@
android:layout_marginTop="@dimen/share_module_tv_margin_top"
android:gravity="center"
android:text="上报封路"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:textSize="@dimen/share_module_item"
android:textStyle="bold" />
@@ -148,7 +148,7 @@
android:layout_marginTop="@dimen/share_module_bottom_margin_top"
android:gravity="center"
android:text="可以对小智说:上报拥堵、上报交通检查、上报封路"
- android:textColor="@color/white_40"
+ android:textColor="@color/module_share_dialog_notice_text_color"
android:textSize="@dimen/share_module_bottom_size"
android:textStyle="bold" />
diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
index 448fef5d09..b54f131d40 100644
--- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
+++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml
@@ -9,7 +9,7 @@
android:layout_width="@dimen/share_module_width"
android:layout_height="@dimen/share_module_height"
android:layout_gravity="center"
- android:background="@drawable/shape_bg_222533_20px"
+ android:background="@drawable/module_share_dialog_bg"
android:clickable="true"
android:focusable="true"
app:layout_constraintBottom_toBottomOf="parent"
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/share_module_title_margin_top"
android:text="我要分享"
- android:textColor="@color/white"
+ android:textColor="@color/module_share_dialog_title_text_color"
android:drawableLeft="@drawable/module_share_title_icon_left"
android:drawableRight="@drawable/module_share_title_icon_right"
android:drawablePadding="@dimen/dp_40"
@@ -40,7 +40,7 @@
android:drawableTop="@drawable/share_block_up"
android:text="拥堵"
android:textSize="@dimen/share_module_btn_text_size"
- android:textColor="#fff"
+ android:textColor="@color/module_share_dialog_icon_text_color"
app:layout_constraintHorizontal_chainStyle="spread_inside"
android:gravity="center"
app:layout_constraintTop_toBottomOf="@+id/btn_share_title"
@@ -56,7 +56,7 @@
android:drawableTop="@drawable/share_traffic_check"
android:text="交通检查"
android:textSize="@dimen/share_module_btn_text_size"
- android:textColor="#fff"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:gravity="center"
app:layout_constraintTop_toTopOf="@+id/tvBlock"
app:layout_constraintLeft_toRightOf="@id/tvBlock"
@@ -72,7 +72,7 @@
app:layout_constraintTop_toTopOf="@+id/tvBlock"
app:layout_constraintLeft_toRightOf="@+id/tvTrafficCheck"
app:layout_constraintRight_toLeftOf="@+id/tvAccident"
- android:textColor="#fff"
+ android:textColor="@color/module_share_dialog_icon_text_color"
android:gravity="center"
android:drawablePadding="@dimen/share_module_drawable_padding" />
- #000000
- #000000
- #1F7FFF
-
- #FF1B1B
- #FFFFFF
- #80FFFFFF
- #99FFFFFF
- #F8F8F8
- #333333
- #DADAE2
- #1C1C1C
- #545362
- #99191C25
- #666666
- #999999
- #000000
- #00FFFFFF
-
+ #fff
+ #fff
+ #99FFFFFF
diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle
index 46ee134c64..55b76a2eda 100644
--- a/skin/mogo-skin-light/build.gradle
+++ b/skin/mogo-skin-light/build.gradle
@@ -33,6 +33,7 @@ android {
'src/main/module-apps-res',
'src/main/module-extensions-res',
'src/main/module-v2x-res',
+ 'src/main/module-share-res',
]
}
}
diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_dialog_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_dialog_bg_light.xml
new file mode 100644
index 0000000000..6011c56ff9
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_dialog_bg_light.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-share-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-share-res/values/colors.xml
new file mode 100644
index 0000000000..5356aa5aea
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-share-res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+ #ccc
+ #ccc
+ #99FFFFFF
+