From abea2fd9dd923d906a522b0b2f4e165bbb55f226 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:11:03 +0800 Subject: [PATCH 01/15] =?UTF-8?q?[add]=20=E5=9B=BE=E7=89=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/item_v2x_scennario_history.xml | 2 +- .../item_v2x_scennario_history_other_help.xml | 5 ++--- .../drawable-xhdpi/icon_heart_unlike_light.png | Bin 0 -> 2540 bytes .../drawable/icon_heart_unlike_light.png | Bin 0 -> 1137 bytes 4 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_light.png diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 43783d6c62..a1722dc529 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -97,7 +97,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="26px" + android:layout_marginRight="30px" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index bb00ca4b09..8fd4be0d32 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -14,18 +14,17 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_21" android:layout_marginEnd="@dimen/dp_31" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_borderColor="#4cffffff" + app:miv_borderColor="#3381A4DC" app:miv_failureHolder="@drawable/icon_default_user_head" app:miv_overlayImageId="@drawable/icon_default_user_head" app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" - app:miv_shapeBorderWidth="@dimen/dp_4" /> + app:miv_shapeBorderWidth="@dimen/dp_5" /> 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 DNj4>e literal 0 HcmV?d00001 From 1982a1793c276cee19401fe630c1e6165bb8a2ec Mon Sep 17 00:00:00 2001 From: liujing Date: Sun, 29 Nov 2020 10:57:55 +0800 Subject: [PATCH 02/15] UI From 637dfd2ff223731076c13d0dd662fd2b3ad0df01 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:39:46 +0800 Subject: [PATCH 03/15] =?UTF-8?q?UI=20-=E5=9C=86=E8=A7=92=20=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/bg_v2x_event_description.xml | 2 +- .../src/main/res/layout/item_v2x_scennario_history.xml | 6 +++--- .../drawable/bg_v2x_event_description_light.xml | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index 1885f84bd4..88fd3e48c6 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index c4deeb0b6a..fa6ccf5b22 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -1,8 +1,7 @@ - - + Date: Mon, 30 Nov 2020 17:45:18 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_ext_dw_upload_road_condition_bkg.xml | 2 +- .../main/res/layout/item_v2x_scennario_history_other_help.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index f2a8033f4b..1dc06f0ca5 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8fd4be0d32..c975f7af0a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -121,7 +121,7 @@ android:id="@+id/ivFaultHelpEventNavi" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" android:src="@drawable/selector_nav_history" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From c232935eb555f7df79ef12d85ebe03ae0666fd37 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 18:01:11 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_ext_dw_upload_road_condition_bkg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index 1dc06f0ca5..e46aa1dcdd 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + From d293b21d2d2fd63bfd2710a473a0f2e67659a338 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 20:20:13 +0800 Subject: [PATCH 06/15] UI --- .../module-v2x-res/drawable/bg_v2x_event_list_item_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml index 534a55cc22..77ada92145 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file From 884586ce35ce309cd7c6c3ab5fffe2b4db89b8d4 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 21:11:31 +0800 Subject: [PATCH 07/15] =?UTF-8?q?ui-=E5=88=86=E4=BA=AB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/module_v2x_event_share_item.xml | 55 +++++++++---------- .../src/main/res/values-xhdpi/dimens.xml | 4 ++ .../src/main/res/values/dimens.xml | 3 + 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index 6098f58094..4c820d67c7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -9,50 +9,47 @@ android:layout_marginBottom="@dimen/dp_14" android:background="@drawable/bg_v2x_event_list_item"> - - + + + + - - + android:paddingLeft="@dimen/num_padding_left" + android:text="10009" 26px 25px 2px + 82px + 55px + 95px + 24px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index c371aabb58..a4124c9e9f 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -66,6 +66,9 @@ 29px -8px 84px + 67px + 45px + 52px 13px From 690706fa2d34bafde3c152acfdbaad7f76e11b4b Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:37:21 +0800 Subject: [PATCH 08/15] =?UTF-8?q?ui-=E5=8E=BB=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/module_event_panel_fragment_surrounding.xml | 2 +- .../src/main/res/layout/view_history_empty.xml | 2 +- .../module-v2x-res/drawable/bg_v2x_go_to_share_light.xml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 57fd474a50..d9a199c6aa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -104,7 +104,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> - + \ No newline at end of file From 29ce6687a0ede8ec52c2a953e4752017e6b218de Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 10:39:48 +0800 Subject: [PATCH 09/15] no message --- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index d9a199c6aa..b9b2ecf8f1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -92,7 +92,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> Date: Tue, 1 Dec 2020 10:49:51 +0800 Subject: [PATCH 10/15] =?UTF-8?q?[add]=20D=20=E4=B8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BFmore=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-ldpi/icon_event_panel_more_light.png | Bin 0 -> 289 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png new file mode 100644 index 0000000000000000000000000000000000000000..62e3039df2fb1c69853bdf8379f9eadfc6736607 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^SUU<4VhD5l(onpw>YW+Vi`g{Z8=I}#DDl{4Y02XDpnbWw`=|f@H6^WV+LmRGQ;r|q)v!q?T(O0f zSNfE=YvHQbzdoM({ej=~$0La5`_{>!p}8u5b7G%V*5%B4)^)9QW~_?t%UsQV@tmH* zX+gU#E1Y_qWRl>sul(3C9_92(!=%;8cW=~77;kP~qPti3=|?%^&2yL7@-DK`b7MaC i Date: Tue, 1 Dec 2020 14:35:35 +0800 Subject: [PATCH 11/15] =?UTF-8?q?[fix]d=20m-=E5=87=BA=E8=A1=8C=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=AF=BC=E8=88=AA=E5=9B=BE=E7=89=87=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable/v2x_nav_normal_light.png | Bin 3236 -> 3176 bytes .../drawable/v2x_nav_select_light.png | Bin 3181 -> 3128 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png index a37dc6a948f5cece381ce060b9d640019a9857b2..96bcc0308cb71320991f9b08cd00742f1e96e963 100644 GIT binary patch delta 3158 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 delta 3219 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 B1AhPj delta 3164 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 Date: Tue, 1 Dec 2020 14:44:23 +0800 Subject: [PATCH 12/15] =?UTF-8?q?new#=E9=80=82=E9=85=8D=E8=BD=A6=E9=98=9F?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2803 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 4690 bytes ...odule_callchatting_user_pop_call_bg_light.xml | 12 ++++-------- ...allchatting_user_pop_call_bg_normal_light.xml | 9 +++++++++ ...llchatting_user_pop_call_bg_pressed_light.xml | 9 +++++++++ ...ule_carchatting_launcher_calling_bg_light.xml | 8 -------- 6 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..05cc876e70b46a2a11411ad44a0b3ad4e756c22e GIT binary patch literal 2803 zcmV(Wg<2R#Zr`oC9n7+*bB?Z3mY2=WC(JS|3I=Jh=2sM zA+dxM%NC1F7|S4Qta(vPzq_Yrn$EeUb4y>HKKE8Xs=?iNN;)q?m?=% zZQHZI+CSsiy0)&ZYwOy&wyu%9UI;9HwxGW_=JDLg$O3(WW4nmS5exbG?Q=a>GF-q< z2#|Mh?Bv)rqG3P3eI6ud!b8N+!PkJ_arW%lJ

rz(}o=e1hxZxsKg_<>@%Uav3F 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 FV1hsPfOr4^ literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..56d420a75d4120df05d8f98722b5fcb8666eff51 GIT binary patch literal 4690 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 - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml new file mode 100644 index 0000000000..5f061fe6cf --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_normal_light.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml new file mode 100644 index 0000000000..23d84302eb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_callchatting_user_pop_call_bg_pressed_light.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml deleted file mode 100644 index 045e0686d6..0000000000 --- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file From add563af69b164e7120d757748597d649de2b2ee Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Dec 2020 15:13:30 +0800 Subject: [PATCH 13/15] =?UTF-8?q?ui-=E7=A9=BA=E9=A1=B5=E9=9D=A2=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=89=B2=E5=80=BC-=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9(button=E6=9C=89=E9=98=B4=E5=BD=B1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/adapter/V2XShareEventAdapter.java | 6 +++--- .../java/com/mogo/module/v2x/view/V2XListEmptyView.java | 4 ++-- .../src/main/res/layout/module_v2x_event_share_empty.xml | 4 ++-- .../src/main/res/layout/view_history_empty.xml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 53f0c88824..6828c691cf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { + TextView share = itemView.findViewById(R.id.share_event_button); + share.setOnClickListener(view -> { V2XEventPanelFragment.Companion.getInstance().hidePanel(); mApis.getShareManager().showShareDialog(); }); - Button refresh = itemView.findViewById(R.id.refresh_button); + TextView refresh = itemView.findViewById(R.id.refresh_button); refresh.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java index e6c4717760..4301964bd1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java @@ -21,8 +21,8 @@ public class V2XListEmptyView extends LinearLayout { private ImageView mIvEmptyView; private TextView mTvTrip; - private Button mBtnShear; - private Button mBtnRefresh; + private TextView mBtnShear; + private TextView mBtnRefresh; private OnControlListener mOnControlListener; diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index edaa337156..b8d06d3216 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -31,7 +31,7 @@ android:layout_marginTop="@dimen/share_empty_btn_padding" android:paddingBottom="@dimen/dp_10"> -