diff --git a/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml b/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml index 636128bfe7..cbf0032516 100644 --- a/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml +++ b/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml @@ -20,7 +20,7 @@ android:maxWidth="@dimen/module_commons_toast_maxWidth" android:maxLength="20" android:maxLines="1" - android:textColor="#FFFF" + android:textColor="@color/modules_commons_toast_text_color" android:textSize="@dimen/module_commons_toast_textSize" tools:text="测试测试测试" /> diff --git a/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml b/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml index 8f692353dc..0f1ee821d3 100644 --- a/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml +++ b/foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml @@ -31,7 +31,7 @@ android:maxWidth="@dimen/module_commons_toast_maxWidth" android:maxLength="20" android:maxLines="1" - android:textColor="#FFFF" + android:textColor="@color/modules_commons_toast_text_color" android:textSize="@dimen/module_commons_toast_textSize" tools:text="测试测试测试" /> diff --git a/foudations/mogo-commons/src/main/res/values/colors.xml b/foudations/mogo-commons/src/main/res/values/colors.xml index a6b3daec93..7f7661f567 100644 --- a/foudations/mogo-commons/src/main/res/values/colors.xml +++ b/foudations/mogo-commons/src/main/res/values/colors.xml @@ -1,2 +1,4 @@ - \ No newline at end of file + + #fff + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index f8386a14b7..dca074dae0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -618,16 +618,16 @@ public class EntranceFragment extends MvpFragment{ mMsgContainer.setVisibility(View.VISIBLE); -// TipDrawable drawable = -// new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150); -// TipToast.tip("分享成功",drawable); + TipDrawable drawable = + new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150); + TipToast.tip("分享成功",drawable); }); findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v->{ mMsgContainer.setVisibility(View.GONE); -// TipDrawable drawable = -// new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head)); -// TipToast.tip("分享成功",drawable); + TipDrawable drawable = + new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head)); + TipToast.tip("分享成功",drawable); }); } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png index c1183aff8d..fddef2479b 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_map_ic_move2_current_location.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png index c1183aff8d..fddef2479b 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/module_map_ic_move2_current_location.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png index 9d3d1e8b2a..8c8ce20e1d 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_msg_container_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_msg_container_bkg.xml index 12a3b15758..f5b8b562ee 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_msg_container_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_msg_container_bkg.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml index 0a3cfd0361..c710e38f52 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index ee58f94945..b84ccdcde8 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -77,22 +77,15 @@ android:textStyle="bold" /> - - - - - + app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 681046e6cc..c28815a838 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -54,7 +54,7 @@ 20px - 100px + 120px 60px 60px 32px diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml index e948980dea..615814606a 100644 --- a/modules/mogo-module-extensions/src/main/res/values/colors.xml +++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml @@ -2,4 +2,5 @@ #FFFFFF #BF30334C + #fff \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 3f596dd6de..e14a3012a0 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -56,11 +56,11 @@ 8px - 56px + 66px 32px 32px - 98px + 90px 22px 28px diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java index 52651147a6..2d7e5713f4 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java @@ -14,6 +14,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; +import android.widget.SeekBar; import android.widget.TextView; import com.bumptech.glide.load.engine.DiskCacheStrategy; @@ -59,7 +60,6 @@ import com.mogo.module.media.widget.NoScrollSeekBar; import com.mogo.module.media.widget.RoundedImageView; import com.mogo.module.media.widget.ScrollingTextView; import com.mogo.module.media.widget.surfaceview.FrameTextureView; -import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.statusmanager.IMogoStatusChangedListener; @@ -71,6 +71,7 @@ import com.mogo.utils.UiThreadHandler; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -130,14 +131,14 @@ public class MediaCardViewFragment extends MvpFragment - @@ -62,7 +62,7 @@ android:id="@+id/window_max_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#7aFFFFFF" + android:textColor="@color/modules_media_music_time_text_color" tools:text = "06:50" app:layout_constraintTop_toTopOf="@+id/window_divide" app:layout_constraintLeft_toRightOf="@+id/window_divide" @@ -92,7 +92,7 @@ android:background="@drawable/module_media_next_bg_selector" android:src="@drawable/module_media_next_song" /> - - #008577 - #00574B - #D81B60 + #fff + #7affffff diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png index 9dd6d425c9..25a48d3421 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png differ 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 index b504cffe87..84938b8857 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png 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_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png index 6a16103d0e..191880b2b9 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png index 7defe6986d..87f712f8c7 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.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 index d20dacee3a..57e9e67c75 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png 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_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png index 3c2ba1225c..f41703de30 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png index 53585d40d1..3ff45f0ed0 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png index 30f26921aa..4f6774eae8 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png index f125b9f22e..32224d0816 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.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 index 1b5af5fe54..e27aa13c0a 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png 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/drawable-mdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png index 9dd6d425c9..25a48d3421 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png index b504cffe87..84938b8857 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png index 6a16103d0e..191880b2b9 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png index 7defe6986d..87f712f8c7 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png index d20dacee3a..57e9e67c75 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png index 3c2ba1225c..f41703de30 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png index 53585d40d1..3ff45f0ed0 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png index 30f26921aa..4f6774eae8 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png index f125b9f22e..32224d0816 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png index 1b5af5fe54..e27aa13c0a 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon.png deleted file mode 100644 index cb48ea6deb..0000000000 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/module_share_title_icon.png and /dev/null differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png index cfcb9eb87f..5a3fbe67df 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png index 0a54b48bad..e13c42513d 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png index 160cdee6a6..85ab743696 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png index d9434fe5f1..049d213148 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png index a050e2b61c..1e25f9439b 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png index 4b82b87aa7..56f1d320ab 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png index 9edf8ac119..b360bb4960 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png index 6ac62048b6..79ee716a3f 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png index de26656f73..60bcfd519d 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png index a4660d5e0b..776f73a59c 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml b/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml index ad3b19773d..a332210f9b 100644 --- a/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml +++ b/modules/mogo-module-share/src/main/res/drawable/module_share_btn_bg.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file 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 b54f131d40..6f1557fc09 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 @@ -22,149 +22,258 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/share_module_title_margin_top" - android:text="我要分享" - 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" + android:text="我要分享" + android:textColor="@color/module_share_dialog_title_text_color" android:textSize="@dimen/share_module_title_content" android:textStyle="bold" app:layout_constraintEnd_toEndOf="@+id/vBg" app:layout_constraintStart_toStartOf="@+id/vBg" app:layout_constraintTop_toTopOf="@+id/vBg" /> + + + + + + + + + + + + + + + + + + + + + android:text="拥堵" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivBlock" + app:layout_constraintRight_toRightOf="@id/ivBlock" + app:layout_constraintTop_toBottomOf="@id/ivBlock" /> + + android:text="交通检查" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivTrafficCheck" + app:layout_constraintRight_toRightOf="@id/ivTrafficCheck" + app:layout_constraintTop_toBottomOf="@id/ivTrafficCheck" /> + + android:text="封路" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivClosure" + app:layout_constraintRight_toRightOf="@id/ivClosure" + app:layout_constraintTop_toBottomOf="@id/ivClosure" /> + + android:text="事故" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivAccident" + app:layout_constraintRight_toRightOf="@id/ivAccident" + app:layout_constraintTop_toBottomOf="@id/ivAccident" /> + + android:text="施工" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivConstruction" + app:layout_constraintRight_toRightOf="@id/ivConstruction" + app:layout_constraintTop_toBottomOf="@id/ivConstruction" /> + + android:text="实时路况" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivRealTimeTraffic" + app:layout_constraintRight_toRightOf="@id/ivRealTimeTraffic" + app:layout_constraintTop_toBottomOf="@id/ivRealTimeTraffic" /> + + android:text="故障求助" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivSeekHelp" + app:layout_constraintRight_toRightOf="@id/ivSeekHelp" + app:layout_constraintTop_toBottomOf="@id/ivSeekHelp" /> + + android:text="道路积水" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivStagnantWater" + app:layout_constraintRight_toRightOf="@id/ivStagnantWater" + app:layout_constraintTop_toBottomOf="@id/ivStagnantWater" /> + + android:text="道路结冰" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivRoadIcy" + app:layout_constraintRight_toRightOf="@id/ivRoadIcy" + app:layout_constraintTop_toBottomOf="@id/ivRoadIcy" /> + + android:text="浓雾" + android:textColor="@color/module_share_dialog_icon_text_color" + android:textSize="@dimen/share_module_btn_text_size" + app:layout_constraintLeft_toLeftOf="@id/ivDenseFog" + app:layout_constraintRight_toRightOf="@id/ivDenseFog" + app:layout_constraintTop_toBottomOf="@id/ivDenseFog" /> \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml index 0e92e92f36..de5262bd89 100644 --- a/modules/mogo-module-share/src/main/res/values/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values/dimens.xml @@ -8,7 +8,7 @@ 100px 118px 15px - 85px + 88px 110px 28px 42.6px diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle index 5269319cfb..fbffb0f6dc 100644 --- a/skin/mogo-skin-light/build.gradle +++ b/skin/mogo-skin-light/build.gradle @@ -39,6 +39,8 @@ android { 'src/main/module-push-res', 'src/main/module-share-res', 'src/main/module-tanlu-res', + 'src/main/module-commons-res', + 'src/main/module-media-res', ] } } diff --git a/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml new file mode 100644 index 0000000000..f1e575c745 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-commons-res/drawable/module_commons_toast_bkg_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml new file mode 100644 index 0000000000..51e1eac4ef --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-commons-res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FF333333 + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png new file mode 100644 index 0000000000..21805b2ff7 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/model_ext_default_user_head_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_cloudy_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_cloudy_light.png new file mode 100644 index 0000000000..ebc208a2ea Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_cloudy_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_dust_sand_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_dust_sand_light.png new file mode 100644 index 0000000000..7edb8c0912 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_dust_sand_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_duststorm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_duststorm_light.png new file mode 100644 index 0000000000..6b70067112 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_duststorm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_fog_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_fog_light.png new file mode 100644 index 0000000000..cff3fb047e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_fog_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_haze_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_haze_light.png new file mode 100644 index 0000000000..36a3333d13 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_haze_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_heavy_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_heavy_rain_light.png new file mode 100644 index 0000000000..d0cfc9a7ee Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_heavy_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_light_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_light_rain_light.png new file mode 100644 index 0000000000..6480636ee3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_light_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_message2_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_message2_light.png new file mode 100644 index 0000000000..53a52ffd6a Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_message2_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_moderate_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_moderate_rain_light.png new file mode 100644 index 0000000000..6480636ee3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_moderate_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_overcast_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_overcast_light.png new file mode 100644 index 0000000000..ef331cedd8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_overcast_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_severe_storm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_severe_storm_light.png new file mode 100644 index 0000000000..1e67af154f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_severe_storm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_shower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_shower_light.png new file mode 100644 index 0000000000..aafd6198a0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_shower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_snow_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_snow_light.png new file mode 100644 index 0000000000..a3cc2043ac Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_snow_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_sunny_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_sunny_light.png new file mode 100644 index 0000000000..f1c9f9aca8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_sunny_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thunder_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thunder_light.png new file mode 100644 index 0000000000..7c71c81274 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thunder_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thundershower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thundershower_light.png new file mode 100644 index 0000000000..abd78fa982 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_thundershower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_unknown_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_unknown_light.png new file mode 100644 index 0000000000..1a6694b3a6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_ext_ic_unknown_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png new file mode 100644 index 0000000000..cc87445c69 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-ldpi/module_map_ic_move2_current_location_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png new file mode 100644 index 0000000000..21805b2ff7 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/model_ext_default_user_head_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_cloudy_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_cloudy_light.png new file mode 100644 index 0000000000..ebc208a2ea Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_cloudy_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_dust_sand_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_dust_sand_light.png new file mode 100644 index 0000000000..7edb8c0912 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_dust_sand_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_duststorm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_duststorm_light.png new file mode 100644 index 0000000000..6b70067112 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_duststorm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_fog_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_fog_light.png new file mode 100644 index 0000000000..cff3fb047e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_fog_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_haze_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_haze_light.png new file mode 100644 index 0000000000..36a3333d13 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_haze_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_heavy_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_heavy_rain_light.png new file mode 100644 index 0000000000..d0cfc9a7ee Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_heavy_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_light_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_light_rain_light.png new file mode 100644 index 0000000000..6480636ee3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_light_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_message2_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_message2_light.png new file mode 100644 index 0000000000..53a52ffd6a Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_message2_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_moderate_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_moderate_rain_light.png new file mode 100644 index 0000000000..6480636ee3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_moderate_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_overcast_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_overcast_light.png new file mode 100644 index 0000000000..ef331cedd8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_overcast_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_severe_storm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_severe_storm_light.png new file mode 100644 index 0000000000..1e67af154f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_severe_storm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_shower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_shower_light.png new file mode 100644 index 0000000000..aafd6198a0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_shower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_snow_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_snow_light.png new file mode 100644 index 0000000000..a3cc2043ac Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_snow_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_sunny_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_sunny_light.png new file mode 100644 index 0000000000..f1c9f9aca8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_sunny_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thunder_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thunder_light.png new file mode 100644 index 0000000000..7c71c81274 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thunder_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thundershower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thundershower_light.png new file mode 100644 index 0000000000..abd78fa982 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_thundershower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_unknown_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_unknown_light.png new file mode 100644 index 0000000000..1a6694b3a6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_ext_ic_unknown_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png new file mode 100644 index 0000000000..cc87445c69 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-mdpi/module_map_ic_move2_current_location_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_cloudy_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_cloudy_light.png new file mode 100644 index 0000000000..f8a5aad757 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_cloudy_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_dust_sand_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_dust_sand_light.png new file mode 100644 index 0000000000..bb569d3acb Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_dust_sand_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_duststorm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_duststorm_light.png new file mode 100644 index 0000000000..a9306d52e1 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_duststorm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_fog_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_fog_light.png new file mode 100644 index 0000000000..e3191b16db Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_fog_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_haze_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_haze_light.png new file mode 100644 index 0000000000..9a175259d8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_haze_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_heavy_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_heavy_rain_light.png new file mode 100644 index 0000000000..611138031e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_heavy_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_light_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_light_rain_light.png new file mode 100644 index 0000000000..befda6499f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_light_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png new file mode 100644 index 0000000000..970f745d27 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_message2_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_moderate_rain_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_moderate_rain_light.png new file mode 100644 index 0000000000..befda6499f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_moderate_rain_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_overcast_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_overcast_light.png new file mode 100644 index 0000000000..b175ea286c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_overcast_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_severe_storm_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_severe_storm_light.png new file mode 100644 index 0000000000..5cef27c8e6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_severe_storm_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_shower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_shower_light.png new file mode 100644 index 0000000000..4e6ba5269d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_shower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_snow_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_snow_light.png new file mode 100644 index 0000000000..c410d04819 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_snow_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_sunny_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_sunny_light.png new file mode 100644 index 0000000000..6772fd028d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_sunny_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thunder_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thunder_light.png new file mode 100644 index 0000000000..c59120a307 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thunder_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thundershower_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thundershower_light.png new file mode 100644 index 0000000000..66059ed230 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_thundershower_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_unknown_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_unknown_light.png new file mode 100644 index 0000000000..523a489cd3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_ext_ic_unknown_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png new file mode 100644 index 0000000000..d3f83f0530 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/module_map_ic_move2_current_location_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_msg_container_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_msg_container_bkg_light.xml new file mode 100644 index 0000000000..366ee8bdc4 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_msg_container_bkg_light.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml index 293e2cfc90..37e38ab7ca 100644 --- a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_common_corner_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_common_corner_bkg_light.xml new file mode 100644 index 0000000000..ea5ba85bfa --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_common_corner_bkg_light.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml index 80efe27112..7ffc077fd3 100644 --- a/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml @@ -1,4 +1,5 @@ #CFCACA + #FF333333 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_default_music_img_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_default_music_img_light.png new file mode 100644 index 0000000000..efe70879e7 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_default_music_img_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_next_song_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_next_song_light.png new file mode 100644 index 0000000000..d105b96661 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_next_song_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_pause_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_pause_light.png new file mode 100644 index 0000000000..6215bd9f95 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_pause_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_play_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_play_light.png new file mode 100644 index 0000000000..7c68250c3f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_pop_play_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_default_music_img_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_default_music_img_light.png new file mode 100644 index 0000000000..efe70879e7 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_default_music_img_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_next_song_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_next_song_light.png new file mode 100644 index 0000000000..d105b96661 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_next_song_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_pause_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_pause_light.png new file mode 100644 index 0000000000..6215bd9f95 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_pause_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_play_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_play_light.png new file mode 100644 index 0000000000..7c68250c3f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_pop_play_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_progress_pop_bg_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_progress_pop_bg_light.xml new file mode 100644 index 0000000000..5ffe812b15 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_progress_pop_bg_light.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml new file mode 100644 index 0000000000..d30c0a264a --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_progress_bar_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_progress_bar_light.xml new file mode 100644 index 0000000000..1d408286b0 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_progress_bar_light.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-media-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-media-res/values/colors.xml new file mode 100644 index 0000000000..3833712d86 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-media-res/values/colors.xml @@ -0,0 +1,5 @@ + + + #000 + #ff999999 + diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_left_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_left_light.png new file mode 100644 index 0000000000..f63e50a750 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_left_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_right_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_right_light.png new file mode 100644 index 0000000000..f6e4175e24 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_title_icon_right_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_left_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_left_light.png new file mode 100644 index 0000000000..f63e50a750 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_left_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_right_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_right_light.png new file mode 100644 index 0000000000..f6e4175e24 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_title_icon_right_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml new file mode 100644 index 0000000000..efa03f2ee4 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file 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 index 6011c56ff9..92df4a917c 100644 --- 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 @@ -3,6 +3,6 @@ + android:startColor="#FFFFFFFF" + android:endColor="#E5F5F5F5" /> \ 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 index 5356aa5aea..3846b5957d 100644 --- 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 @@ -1,6 +1,6 @@ - #ccc - #ccc + #ff333333 + #ff333333 #99FFFFFF