diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8853517620..77f6cae560 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -79,6 +79,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png index 7bd702be90..87f8917f9f 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err_press.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err_press.png new file mode 100644 index 0000000000..4318fc1e86 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_err_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png index 89c3bcf3f3..ac0f7e84a4 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true_press.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true_press.png new file mode 100644 index 0000000000..ec4559d362 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_report_true_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png index cc7ee57ee2..a4b8fbd13d 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err_press.png new file mode 100644 index 0000000000..ffac947bc7 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_err_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png index 187a3a179b..1614677f9f 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true_press.png new file mode 100644 index 0000000000..cdad7807af Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_report_true_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err.png index cc7ee57ee2..a4b8fbd13d 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err_press.png new file mode 100644 index 0000000000..ffac947bc7 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_err_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true.png index 187a3a179b..1614677f9f 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true_press.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true_press.png new file mode 100644 index 0000000000..cdad7807af Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_report_true_press.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_err.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_err.xml new file mode 100644 index 0000000000..bfbafddbd0 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_err.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_true.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_true.xml new file mode 100644 index 0000000000..c53b2ccb27 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_icon_report_true.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 886ad47555..13ebb3bb43 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -149,7 +149,7 @@ android:layout_height="@dimen/module_v2x_event_button_size_detail" android:padding="@dimen/dp_15" android:scaleType="fitXY" - android:src="@drawable/icon_report_true" + android:src="@drawable/v2x_selector_icon_report_true" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" app:layout_constraintStart_toEndOf="@id/ivEventLive" @@ -161,7 +161,7 @@ android:layout_width="@dimen/module_v2x_event_button_size_detail" android:layout_height="@dimen/module_v2x_event_button_size_detail" android:padding="@dimen/dp_15" - android:src="@drawable/icon_report_err" + android:src="@drawable/v2x_selector_icon_report_err_light" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/ivEventLive" app:layout_constraintStart_toEndOf="@id/ivEventReportTrue" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_ugc.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_ugc.xml index 6a257089b0..e465d4f012 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_ugc.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_ugc.xml @@ -41,7 +41,7 @@ android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" - android:src="@drawable/icon_report_true" + android:src="@drawable/v2x_selector_icon_report_true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivEventReportErr" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +50,7 @@ android:id="@+id/ivEventReportErr" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:src="@drawable/icon_report_err" + android:src="@drawable/v2x_selector_icon_report_err" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_light.png new file mode 100644 index 0000000000..4d0907cfbe Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_press_light.png new file mode 100644 index 0000000000..9be72515da Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_err_press_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_light.png new file mode 100644 index 0000000000..ac0f7e84a4 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_press_light.png new file mode 100644 index 0000000000..ec4559d362 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_report_true_press_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_fenglu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_fenglu_light.png new file mode 100644 index 0000000000..130d2b39d5 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_fenglu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigong_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigong_light.png new file mode 100644 index 0000000000..c2272926cc Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigong_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigu_light.png new file mode 100644 index 0000000000..0e1018a778 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_shigu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_yongdu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_yongdu_light.png new file mode 100644 index 0000000000..01f456eedf Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v_to_x_event_ugc_yongdu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_light.png new file mode 100644 index 0000000000..cda3e8a001 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_press_light.png new file mode 100644 index 0000000000..9c35616e92 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_err_press_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_light.png new file mode 100644 index 0000000000..1614677f9f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_press_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_press_light.png new file mode 100644 index 0000000000..cdad7807af Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_report_true_press_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_fenglu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_fenglu_light.png index 6478c9abf5..3857b1fa7a 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_fenglu_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_fenglu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigong_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigong_light.png index 6d32db7d85..d5f195d1cf 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigong_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigong_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigu_light.png index 72ed455cf1..2e299f3ea9 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigu_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_shigu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_yongdu_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_yongdu_light.png index 1f20e6c0b4..d25f5fe8fc 100644 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_yongdu_light.png and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v_to_x_event_ugc_yongdu_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_err_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_err_light.xml new file mode 100644 index 0000000000..30caaff0da --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_err_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_true_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_true_light.xml new file mode 100644 index 0000000000..4239e59629 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_selector_icon_report_true_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 21bd14ebf9..83d664a04d 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -10,7 +10,7 @@ #FFFFFF #80333333 #999999 - #B2333333 + #333333 #666666 #F5F5F5 #FFFFFF