From 2cac9cadcb5cbbefe09d4b439b96a39c28c8282f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 16 Sep 2020 14:58:34 +0800 Subject: [PATCH 01/18] change the 9,png --- .idea/codeStyles/Project.xml | 15 +++------------ .idea/misc.xml | 2 +- gradle.properties | 2 +- ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2793 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 4669 bytes ...e_carchatting_launcher_calling_bg_light.9.png | Bin 0 -> 2795 bytes ...ule_carchatting_launcher_calling_bg_light.xml | 8 -------- .../module_push_message_background_light.9.png | Bin 2779 -> 0 bytes .../module_push_message_background_light.9.png | Bin 2779 -> 0 bytes 9 files changed, 5 insertions(+), 22 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_carchatting_launcher_calling_bg_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml delete mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png delete mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 0d156937bb..663459aa50 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,18 +3,9 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 57bdb8d90b..c2009768d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 # 探路 MOGO_MODULE_TANLU_VERSION=1.3.1.24 # 车聊聊 -CARCHATTING_VERSION=1.5.3 +CARCHATTING_VERSION=1.5.6 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.3.4 # 视频引导 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..c7879ce453b3db077f6cd1a886668b8350054b57 GIT binary patch literal 2793 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 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..8956d3ae1380b658eceb93d8c5cff06fb987ef16 GIT binary patch literal 4669 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 xfyE2GipUtpc - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_message_background_light.9.png deleted file mode 100644 index 245c2e855c00fc86809e0b4d0d5ff617f34d3db1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2779 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 Date: Wed, 16 Sep 2020 16:34:58 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable-xhdpi/v2x_panel_close.png | Bin 1574 -> 1188 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png old mode 100644 new mode 100755 index 892b93afafd5b06df2ce65cd69df412b609fe74b..bb3e2b1195d085154afcb2ea9a72cde9367202f5 GIT binary patch literal 1188 zcmY+Ec`(~)7{`B!qZ-vHOB`{RtTV&1Nr6}pZwJI&VB30l=f z+;s&(h;=v4R@b(5WQA%s(b}?$RFX!JeY>66nSEy7@B4Yqci#7p_m01xml8q?0YQ+G z_bEak*!@2(1sR~dGjJ*d!Q}jXgFS!?Oe&RTW@Z9yYH9*dT3R|iJq@_KyPHa-4h;D}=-qFzk0HnYKz+eaf(Dk_n#Cv*rz_h`^L2w+4#hRO&o1dTOa5xJK3tTRDb#--Z zZEbyh{lmYuv$G=<3W4(Ze4qk>Kr9xEL?WOPiDZ9&|KR@yF8iPD{+&?n98p3dm5-^YsH%RUrlyY4(9qP>(njm(>gnkl7#bNJH#WhT znOk6;oKLz0goIqWmGx6jegWlPRV`zLy~5qt+7a&UFE>QnLJ<6;H^DVHghhK09=_Ui1S!))D=pl#os~{G%=-UBc(K*?_4y6zA2y87T-9( z_$SAGLNkQe6KZAQ@{=WX{hf|PuVN*FT1e1=Txtq=udz`Zsl0U3 zhbcA(i(vCIwvD6m=qTj&ed}?ys^$^|U45TC4Ie#xmrk9~mB=4w)&7`_f|%Gr=-c zcvybAm|F#_e)8HlhZF+)-m(l+V2mhWF6Up6F6S!xoq>OxuuD*XgQl@uDlqOXFB;L0 zi}de%SRTx4+qqrzPVi1l6=4%c;kI=ouGoS%P~{q0Ku#oRSGrJNfk-aN4fzeE7_DEC zxyxr6I~NWsLF~Gtn{e^hMj7aU&6X`I!-bK(a+MWiY77@Cp@@@V)_1gN@oe=PwV&-L$(x~$ zH!k7J7iAgT-ygl~YoeVvc$$<#p#+Uj^F`^us97KUc;)g{oX?=94esT+SR>rSr9k_L zk|*v#B`Y}WH3Wrdx=6$aEx$VxS$;8Zb>P*Jl=_$ESCoT#8Nv#T&0nv^eY6Tq8Ns$@ hbBk$=3udQ6gnBk}u(QOt&|9BA8*dLkLaSS3_CMJnYxw{G literal 1574 zcmV+>2HE+EP)Px);7LS5R9FekSxrx*MG)S3`3UQP?q-2mWS1FVn0r>m>0tE+qN z+$nxDGc$LWmzN(&Jw;++Vc|nzupA#B|2aiTe2>P)#(vt^*!X07d;5@$L1Sa%0}^ER z_V#{Dnx7ZSHjvQca18Ryx3aSG$YHcc=%V%klAnoqobqW>o%hX8QPRu zKF@8qByELR(I4%v z&8pipeRg*Cn@_tCFoH+R)z#HK-LVpyHV}CWoWzx+Q(Rdn6mk<26Th3~ivy)+xj>mr zCe5XG`K;6SSc6Q8TL_~x`Gm-$yNY9NZf<@i0h0bB5!BZ=1@sRviZzK(sJpwnO#tb+ zMThi>S{}n`GivuOM-iOzz`(!{WQm4q274IbQzafEjizxn4oN4k99R>;)whMLcj#5(2Jv;ixgpb%Jxu z#8=j>d))+-K#YpOVD4f*1I)lJj2o6VAu_XH$Sb%soWtH`!5*@BiAI-O3x7Yocl zuE8bXmy5@+LPIPtH6S>HyJ*8xMChpU;^LyVEU=zFfy69Ppyb!p)t$!z1N3V>eQg$> zx5!|OApygmFg)dbn1M%-IjObHu|SO;dBZ}U_^0;@5!E3n-z0BtR7%=8N{%TP+l-BQ zPDKe;!pE*F$N^x0nITF_SqYFUE9pP^p?JKyx_a;Q^t8q8kfct#YPk?F8`js?>kbbO zpJ<^tT9QClrUY077_{Mv58-Y#!qX)H|3+4Mq%|V$+VzJUu1G{~s&V7R~ zhj{X`8jnn*FwK5&aL|H5N@Bh!a+8wF)ZX6yT&^#1Sg{J<#QEX|jcao=Kv&kQ@Y_(- zRV+&JkiuO0WE_YO~@+Df%yP(TPb9<6JzShXJY9eQkcyD*)bje7$&n|dDGW< zja4a)10wXWru&yzST~ZU#R1TE+bJhgNsMt=?%GsVVLbt+pa|a00Jr~L>Gn!#ZYDhG zWaSc{q<=*UyMTzjsoB}t2K?Wf#%8U>Az^-eSE4LWCdil{HcuXLG&eOhbq=}8QbRTH Yzn}sAvV$Wrz5oCK07*qoM6N<$g0!~*)&Kwi From 44b20f7c138e8c0478801a99a6160972c0ba777b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 16 Sep 2020 16:40:05 +0800 Subject: [PATCH 03/18] =?UTF-8?q?ui=20opt,=20=E6=80=A7=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A=E5=8A=A8=E6=95=88=E5=AE=9E=E7=8E=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values-xhdpi/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../res/layout/module_ext_layout_entrance.xml | 4 +- .../layout/module_ext_layout_extensions.xml | 4 +- .../src/main/res/values-mdpi/dimens.xml | 1 + .../res/values-xhdpi-1920x1000/dimens.xml | 9 +-- .../src/main/res/values-xhdpi/dimens.xml | 7 +- .../src/main/res/values/dimens.xml | 7 +- .../res/layout/module_main_activity_main.xml | 12 ++-- .../utils/animation/V2XAnimationManager.java | 67 ++++++++++--------- 10 files changed, 61 insertions(+), 52 deletions(-) diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 1770c16984..ca1346e002 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1053,5 +1053,6 @@ 42px 48px -10px + 10px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 1e2c7b1cdc..170c5a430d 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1044,4 +1044,5 @@ 22.9688px 26.2500px -8px + 8px 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 b84ccdcde8..e962718e6c 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 @@ -81,8 +81,10 @@ android:id="@+id/module_entrance_id_move2_current_location" android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_move2_height" - android:background="@drawable/module_ext_dw_common_corner_bkg" + android:background="@drawable/module_ext_shadow_bkg" android:scaleType="centerInside" + android:translationY="@dimen/module_common_shadow_width_pos" + android:translationX="@dimen/module_common_shadow_width_pos" android:src="@drawable/module_map_ic_move2_current_location" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index d4118d06e7..703bb00968 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -73,8 +73,8 @@ 26px + 66px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 0304873cfe..4d5d931a5b 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px - 120px + 140px + 140px 120px - 30px + 20px 30px 32px 32px @@ -146,4 +146,5 @@ 40px 45px + 120px \ No newline at end of file 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 6e8de9e26f..ce413ccb95 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 @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px + 140px 120px 120px - 30px + 20px 30px 32px 32px @@ -148,4 +148,5 @@ 175px 30px 45px + 120px \ 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 2f344bce6f..4c65427b84 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -30,17 +30,17 @@ 20px 1px - 66px + 82px 20px 34.5px 58px 17px 31.4px 1.2px - 66px + 82px 66px 66px - 16px + 8px 16px 34.5px 20px @@ -153,5 +153,6 @@ 19px 16px 26px + 66px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index a9cf9fe2a5..592d7824ff 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -48,6 +48,12 @@ android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:padding="@dimen/module_main_entrance_fragment_container_padding" /> + + + - - - { - final AnimationDrawable drawable = new AnimationDrawable(); - for (int i = 0; i < resources.length; i++) { - drawable.setOneShot(false); - drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration); - } - UiThreadHandler.post(() -> { - targetImageView.setBackground(drawable); - delegate = new DelegateDrawable(drawable); - start(); - }); - }); + INTERVAL = duration; + start(); } @Override synchronized public void start() { - if (delegate != null && !isStarted) { - targetImageView.setVisibility(View.VISIBLE); - isStarted = true; - delegate.start(); - } + isStarted = true; + mHandler.sendEmptyMessage( MSG_LOOP ); + targetImageView.setVisibility(View.VISIBLE); } @Override synchronized public void stop() { - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); - targetImageView.setVisibility(View.INVISIBLE); - } + isStarted = false; + mHandler.removeMessages( MSG_LOOP ); + targetImageView.setVisibility(View.INVISIBLE); } public void soptWithError(){ - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); - } + stop(); + targetImageView.setVisibility(View.VISIBLE); } public void release() { - delegate = null; + stop(); } } From cb35854b4968124d89d7209b7e533bb052313e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 16 Sep 2020 16:43:44 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUI=20=E5=87=BA=E8=A1=8C?= =?UTF-8?q?=E5=8A=A8=E6=80=81=20=20=20=20=20=E5=88=86=E4=BA=AB=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=83=8C=E6=99=AF=20=20=20=20=20Tab=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=8A=A0=E7=B2=97=E6=95=88=E6=9E=9C=20=20=20=20=20=E4=B8=8A?= =?UTF-8?q?=E8=BE=B9=E8=B7=9D=EF=BC=8C=E5=B7=A6=E8=BE=B9=20=20=20=20=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=20=20=20?= =?UTF-8?q?=20=20=E5=8E=BB=E6=8E=89=E4=BA=86=E5=88=97=E8=A1=A8=E4=B8=8A?= =?UTF-8?q?=E6=96=B9=E6=A0=87=E9=A2=98=E7=9A=84=E5=8A=A0=E7=B2=97=20=20=20?= =?UTF-8?q?=20=20=E6=B2=A1=E6=9C=89=E6=9B=B4=E5=A4=9A=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/fragment/V2XEventPanelFragment.kt | 16 ++++++++ .../res/drawable-ldpi/v2x_shadow_bg.9.png | Bin 2454 -> 2492 bytes .../res/drawable-mdpi/v2x_shadow_bg.9.png | Bin 2459 -> 2496 bytes .../res/drawable-xhdpi/v2x_shadow_bg.9.png | Bin 3928 -> 4016 bytes .../res/drawable/bg_v2x_event_list_item.xml | 3 +- .../main/res/drawable/v2x_panel_color_bg.xml | 2 +- .../layout/item_v2x_event_share_load_more.xml | 9 +++-- .../item_v2x_scennario_history_other_help.xml | 8 ++-- ...e_v2x_event_panel_fragment_event_panel.xml | 35 +++++++++--------- ..._event_panel_fragment_scenario_history.xml | 9 ++--- .../src/main/res/values-mdpi/dimens.xml | 2 + .../res/values-xhdpi-1920x1000/dimens.xml | 3 +- .../src/main/res/values-xhdpi/dimens.xml | 2 + .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/dimens.xml | 2 + .../drawable-ldpi/v2x_shadow_bg_light.9.png | Bin 2778 -> 2805 bytes .../drawable-mdpi/v2x_shadow_bg_light.9.png | Bin 2779 -> 2803 bytes .../drawable-xhdpi/v2x_shadow_bg_light.9.png | Bin 4650 -> 4690 bytes .../drawable/bg_v2x_event_list_item_light.xml | 2 +- .../drawable/v2x_panel_color_bg_light.xml | 2 +- .../v2xt_dw_common_corner_bkg_dark_light.xml | 4 +- .../src/main/module-v2x-res/values/colors.xml | 2 +- 22 files changed, 62 insertions(+), 41 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index fd5a81a5aa..fd51aa6146 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -1,6 +1,7 @@ package com.mogo.module.v2x.fragment import android.content.Intent +import android.graphics.Typeface import android.view.View import android.widget.ImageView import android.widget.RadioButton @@ -123,14 +124,29 @@ class V2XEventPanelFragment : MvpFragment when (checkedId) { R.id.rbScenarioHistory -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(2) mVpEventPanel?.setCurrentItem(0, false) } R.id.rbSurroundingEvent -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(3) mVpEventPanel?.setCurrentItem(1, false) } R.id.rbShareEvents -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + TrackUtils.trackV2xHistoryEvent(4) mVpEventPanel?.setCurrentItem(2, false) } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png index 6ab0b1547c1a7560b9949023f478fe852b89f1bd..b1ab35dc0a14494e8f303c3d92666a37b7dfb431 100644 GIT binary patch delta 2482 zcmV;j2~GBv6TB0UB!7cRL_t(|+U;FiRvS4G&DUfL*~A2}-F~&(HsIjcW-!K>FeGNO zfmy?x!yaHee6j|?S%);V<~KDqbmR_T7U-@RMyTC7PGt60S< zR;t@4huL|!sMKVQRHc89vf5V_)#?6+DtWFp4j!uY z@olX!zOFULm(|9&FaJl+57pPNC>nkc0AC59?>9@kiw#j4a8;TB1$b7P2nGBn1iS%X zSJXG)Yv3&r1AntC;HxPK6?Gn3&<*(eS&hiw7W@dFRUN1jge(LZ_toa%Rku6)@a6;z z27~tkybA&HqXOLkziUA+VdZZk;P(vR5cn;ld`QA)R0?pT_<>bC1U*wdR(@I$xB*)6 z5OfK4RRK@`)?|zyYw_X5VDR_*Hz7c(UVwgM6rUARe}9=+P6gTywjfshQJ;X$seX{F z{z`R3fZu0Szwdw#m9K$Udt>ZWEuP%G;x@dDfKqAq<3@S+ZW91+tOi;RO9HeUtbA)V z*me*J)q&X|=-Th0)gKg}W$G}q(2=M6*PyMT%6i1KgPLt=iPy7ZChz-O%Nj17?;YPC;Tu32Zj=Xl zZ6B$gZ@8}KYv3*TlSMV#>+wY1g2!iA(bEYKGyc^E^!#$q@q5mK@@xkIZ)``N@wAhA zKYzBL3T(J&*4NDz_^?1MZSs8lx;=P;>UrDI%@-p4Orhize;9&>iPB9j+}XxV;Zkf|FQbpV-HyGJRjyd zochhIPns>X9Ig6>*?r%Dwa@b@5mxnf@&RKe*tP9oB0LfhOr8&4xIp>2vwuFAcr@s$ zlH*nNfc4Mw*@?#?0RnGTUxy@ky#XQR`I+)r;GxxI;49$u4M;TjGjX2zCm@_WpI1Fp zKLj57zO1GI-*XQLEzj4J&eWZFT3G$G6!?k&k2fI1Jl}n2;f9M;pDDfpz;7liARwqb zKW0Wus{F)NzrF#@J;@N@%%=6K>No)ryAC&-J?y*+_0?qT$sEOHa=A0^D?VVGfHz3SB-%&knxZ3}L^3}O>sz~sB1H#Mm zk>|IUc|NGl=?Vx4G=I-;I?Dgz>>6}yL8tyLDAYXPd0;`%0pLyG`>oEOX7_4AA?Eqc z>y~;w7&}|Qdg6=(uQwpXJRep}Z3n2H0x#9?_XY%-=jW+E1sr?6vK~W%AfS8ZkAP6~ zd_8W)+{DvyJs+w+_IU$B&GVbg>lRr~8`}>A-|GzsHP4T;SbrJ6a@`wXK+k}0t;&Kz z%kyIwC10p|HlFzqxQ5-jK~sD4mh2?#OIr!QOXu@ytxQFXS88xUrm zZ+0^A#8mY}{Ym%hDtbV8c|MwUz%57t2Z{%(w?usPdjmqu^SRfp(`>;F(8`y4vI+u1 z%k#C}n3rx2@PAVI8hk~-_SaS1fbjBs7%wcFcvA4wlHhy40iovk&O=Lp4d;B?bT#lP z5#Rh05MrLM_AXVw1p15serDA#fKPlA5Ne*!He9WKasv$T;Ovcn^ef`w<@t{1lQA

uhusaO(~c&hovB||XZ!rpV-FbjL(KD`@55Oi5dlC?tw*VU zvE7^d`)sBB2x+Zxa35Np@67ny%Np<8o_FW>v)MoXKHQo$;;Yc|e4Yf}awGv#{c`W@ z%>914Sbr}0L25z3V@P>Eec85v;$_2aBil)DfB^roJN)kd@4MLd zwe{#5(Ahm-&FAaol0QyRYmRS1$@9^)q~E^89qvoMYeLncsJI z{irV{U(E8CBkHZAOZol$dNREgz&`w{d46a6+e5N5zm>t7Q2V8f7oPaSeH#Lb wRV%Dw6{}dqDps+IRjgvI)mjwwqWaZ6F#rGn07*qoM6N<$g8T3EF8}}l delta 2444 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 KP6b4+LSTXtYV~#i diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png index 2466405ac2034f8577d12c040566da0888b2fc2e..e6a5e8d333e34755b4a14abad252bc39758bb53a 100644 GIT binary patch delta 2486 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 P015yANkvXXu0mjfl7RUh diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index 239b9eb1145192edb2d2a0b5996c766591b3303e..07523abcbf9b44490db0eac37365af49d52454fa 100644 GIT binary patch literal 4016 zcmZu!c|6m9{2#NSj9lMl$x)gkeG?;Un1&FBQK=NZt|?4%jC`9TTt4cmp-1ptvb!8d^nKzrnHG{JD#aBc!My{5ZYVWx;Y8Ia6SgQT%3vOp~ zsMNUS=Nz|*OVK-exjF3H$F{`1|M%hQ#zF|UCE#pmTy`4EnbEgX@4Wv~;ufW0BE2le zj4{@7)Cszt{jH*yzL~r2r#d|QCHDEHaVPJ_^ktjXEtl%UaWxM6yw;~8AB*d4{xlkP zdgbhQ(_;Cf>2un|Rf=KY()bYd#}na*#0y$Y<+^JD3#?B~3in>dPk6I^w3Bw&gWJP{ zJTa-bla*)cSPamVZ%y@)$@hP0iD0UAZWl@{8E7676ca3ojLXK9>%U`ps;gY36 zh}d4KbQr|?O4Na6DTNa4Ly)`9ft|=Y0gW04C~A+%ZGq4NO;1R7L=oCR3FEfVR6Vn9 zC}sx+yT_QBaOCqRD8yPHq3Og&hK!x-ll{Ii4}ZMLh%ZPzrqm(2gsdBmWx}lp{q$1;UeMqF8OPTsswpY})ZgYw4)wmOhEwye806|Nvrt0@G@dEdiq?4M(ZhMrly{%ss zyX&?p_T(V%L}yMy7jw+5f^VFEjfrx{?9rTe$pMbu)v}Dq|Ey{R#J)mfU-wzsyP~A6 z^BJG^%LsW%r!(4bILN@m2H)kTo-MYvin*{T@mk=@cawuT8Kq6d+J#>N;BX;W!*LZ% z8J@P~6iz+qLbyAUN+1-_%=5bct4b|@+|gq;U_mONAqBAE+4)ZsTW8gCdo$56NSoed zO*rD}P;Dhi&c!duQ*=CS#DlKp9BL9#{~4kmxSooblG*d#%rDa_b4R2ewfpD;_DZ@oe)`*#$%xjOk8FFr=TEPW+^E6}}2{Jy& zV_MFk3TE}Xd^Cz#3Ry#r!cFw2smScgjwvRH5P&NcdZE*7{6e^g$&Fp#ycxGCFPN}E zqZYG1R1>~peRVGHO0e`3>rr_wr*KozD4>gnChBR#@L)nV6Xy$3t5df|T)XuvP5c@* z7DWvY!pX>OwFx? z1K0_}8_fmatKFK-LZWaMA^FYuR8My?~nS4W{1vn1n*M zH&x=<$XhZ&$(1}}x`J-l{ha6UZPKy+Xb|ont+u#ls)enOxR8@*WSxoMGqb>2ZY-6+ zJYE}ud)r@ZuAn)OZ^imzg>Ot9Zl!S0kT!A*gn> zcO`!%RnRoe%U2UmQ8UKh6+)K}n<-EJr>xn;3%&a3cIQbSr z|J#oFB--Wyi5g#LJ%HVf7J{erO&XpF={JyX0@JG_Uz4crJQT9+Y1zF-YxOo!35zUh zoAk_#SiviuJCmzBb7(eo1vMzg{!e6=ZzH4Aqw0-=?2h>8or$q1yuzg*niqwH0AuvP z&F{ppWI=|0`K!99eP}hdE?Bi{m0frloQ&0{ooB z)jUZ&Q5BBpH>;b>Qn!r=`7ECEW9K>$b&-T9%TV^p6x*okE1Ff`h`6~cxrPW8=MvDJ z98<6RN&h18@L=H&(2%oB%qcYGI0+G)e2ph3BIYPps=pB;0$4V8a^9@eK8f&+s?TOh zzv{cz!BN)Fp?^Dy`^RaYQ?$5@W*;ZBAL;X4=nfC{YnA}Qz*0JEz04m+J$E)`d_+^O zkPw@5LbAwnh!-iHHr0+fjThU1T(?LF{la4mm?r*0yv8p1F3yh(y2+xR{XU4p?rgUP ztN?}M&_+TS^H4UgRNl`Js9BNdFG^EnyIpu?zY3AYb?Fp|)h$}!qZCKaxowH;Wt)(+Sv~4!$ z(L)qR78-1a2~t@xAt46*PoF{CMBE!$zR#SN|5Kp-q0Rz5tzjK7zv!iEAF(ilFw4h`lM*t61A5X+6n1BudVs^^!})1*=%RO9XFAT0VpsAVX_fM8QKDS|@c%GJ_@t6)q^_jXoEDLN-tW{9AM!08%ID2#Lzot8 zg$4rK-r>K?lVJ!rJGsJ(Cmr z$kFWL=|6P6wUvBly9 zJ3fY7`Y|I_xKf9kWg2opzHyx&{Wz}h*+>K0KA!|pf6HDz_468%iBLLaQ%jdWA<4tu6+`4A4S9b8f|h@ z1l7P$!I^r#^C;TJLIxUQyGubNaogqY$KO_zan5!=WA}-a2xb2G8O;%h2Ccr}Tlg^d zxbvjjJJ%%07L@PJB*$z)t3RD(cRSu132$|H!Y6A84O@7Wgf)7E@;C|ogYdeA=8@xB zqZaqweJ)hU@Hc^(k7x(G%Z=SKahLQe3-g?h57aQVzE#B z1d=%pP7-Utqzx$OpR3Q5wK`seK5;bP%r5`%t<~k6Y?8kLZaRPlHBzm$6qd!FViOBc zFILAEa>tBhb0!of?k!LJ<`*Vp9?&9+aVGhCu9q);qv#M9C_k?Pv}DseOnSXhd!(M| z&o8aoR*XkU-+Kv&2^f+bwo=`^WnC{@3vI^OoU3qz6zcr;$X9JzC%5jYvy|oXvUG^l zUXM4w8*jC@+LQ1cf7|kzAa{|QuS0Aa-&m%&)=r`+c_f65Ta&40N#6}wOybhEamz`t z>XCEPhk<}u^xl4RR!r3J0Z-r0iyZ^f$HGqNp9-`Eka^RP%jp(`=&xjl$5w-DTs(I& zc51Z_kF`nia zOXmQ8-{x8yT_oyvF2U!ypN7*hRJ`(sU)z!T+skEjQPP!a)D}s_EnzNU5NMG+Xc>gl6D7ugkcwtCBK{bIlUom7n?7~vL0@I%de_GuQ z_-D|c3KTY#oc9ag`B7ca{o({ss$1Ho{gJ`cKY0%aK z14#eIb3KN#61L58ucptji6I}Z?H>cEaiKxeOS;xNTxIT z9M4mdO))UP`mA&PNq&52Nj2&Ko3p%ad)75cRppEhVocmFI z9IqBlQ8P=_Uy@T@|Mx)b_v@^Dfgfro&1Js^G9AN{ynUcb%!ipC(-H0H1!(=eL- z!0FT!cd$D=vYY0ue~sB0{d7FHgKbhUtxz%W@yn8eKAQAit!8Msp&P3aS+euHLB(;p zV{l;ofsts=$j6zMBeIpbZ5u@shRs1jtR_eJPO+ie&Eg4#pTwP09-{3nS))r^7h`Zu zuG0>BOjRHVX#cWxVF-54c|)L8VcBG}@ez`h3%-D{&V}TfNQ#1# zg@s5tM+A$Dkbu)1S%HU=$)jSDPIS(@`s0@B&pBI*({kDL&S;A^9NlB0Cq{a)@LgSk zFwIh1INm7_O3}ICT_1Ykgt4_pYmTyo+TCR}Tav)RLJc)Lmn1F_L`??Pwxt@ea*796 zaZj+qrsK$nEo++_;mbi<#(1KD-eC1D*wYA$;rN$R^FF87QbyV zwEA|#%)U^EKiKRXk%$!wc|=NF*ot}D{VIQ=nR2= zxi_=J4v`^0=P2>yVLTVxr1QPL%z>=qc^jx|7Z>dlZ-5evvjuqN&aBG*<`+M`kYp#^ zW8`2G=OM76ETm{~tSNzdyzl9y;ki+?5Q?tD zb~^v_tL#zgxiIo2B-&`_A3AFEYbD3M{jd6RJ*6lR{lNz$ia;vx8nCb^O*k6e`rYtVY!+)y}B_ z)5TOCX!@i`2=;x;o!bVbOaVxGxA*0^FL)~}NXVTVO?V^_c`21pAr1_d39BqWGb>+AiB!^-3V9oc-b^NbhT)r0Y*p*rN zvQT&Wt51Y^GEPh+ueko-qu!P_rxv_voTJ$oo62gSm=T4_)-r*#Nwp)%%EW?lEe`CF zw4nwGTxka`(a1Y_-8a7cIpZF?^aEV8Po|(gH4>^FQWp*j`{bE2IS%V2Q)(HC#A=n9 zR)BO6ny^2jz4?5L&`|4ge8bX?_?JKSrAI})#~q9O5ExfrM=W6$;;`)((kiX+>j96u zBT4k{TiE?bEzhg=RcD!xf@@#C9WT_(yA^qHP()lK?-it>4fQ_g-d*6(NWifuHSvRi z7Jyv&b!|JGuTfF0;0s_{1639(ZcWjD#_rpffjH&o#+~H0K?uq0RwOpK>_)jay^c%rnjE}Al4p(sSthLjX5vQlIz;m5;(4_FhbG-S z6c0;H?&b?s@rdg+?d|0f&?dDcFN6}TasSiAu!t)Z9n`wJS;1kFolHcVFJyLL1kyy% zy7uuV-bWEJl}225Yg8-5`D_(rQ;K}>Q(dTI{$`x}rfU<>^MVdOneD~)Ak_i8tMtMK zzl?I7@jJllyM8K!+%K&#eHJq%bC5{^pP<2B`V+CH9i)q;Gb;nt7W+NSNK4hdteMOk z@q>fcI368;)JH(+=kB}$7sP$)R-L^1^ei%<^H?e+IFnLKL+M9VX-^m=J3^>1oY2&_ zOVVpL4ZOK5iicyHUMk*rt2SQ@a_rclLKbwF( zn!rT}kd?S34d-UC08!i1BB>M=Ewol$eYvAw%w0gcio|v9pO1fj#8afz<_W!)8zKYmDi$z0>6F^H!+p-yLtQ8b#kfliw5`zB`a5%y zdF(B#b(l;aO9L<=&e78n2Z}M~ZlKqGo;`p*Uj?6!>}L7@j`q6tPE!%C+12^lK)n!& z)l#2X>0fh=<(?qqqLwjZC>te5bR3!b`=nOKO27PMjMT1r11~6vQX3)dnb3V&-Z7V9 zaC-V>(>nZ&@62UVX9)uJBJRca97~UNEshTEaftAP1x#}{Yhk(T=6S)G7*(Sq6lck{ zM~Gx60(6QrhC;h)+?2w5I_tT%=6`l$dZ>9=lb?n?Zft`pXv< zD8=kXzW3A;ccK;svuO(Gd0!H_eR5wYiJX?>PCbVUhdY>&I>!+bjz{0QLCQ2|Toh>Y zj=?-bZ&E@_Nn#D~6XdPWBWC#>uar{+Xb=|${CsXu+Jg>b&%+)0adRmv58uqpMPY?5 z3(h~~uQrX4z?y~Hc?|6n0-LtaALd&TDcvtu{gNpwYC~Jc599OVc#G|>!wCO8rlRge zB_}NYJy!Krsh3c}E1UuX)N7=ksX9bj@9t@Q$%E2BfWAq_T{wwMN~7n04ZNDMfZ6V6 z;gY0cYxPfHr39tYhxypTNeT5zRQOPDX%9DAE9qB=yq<;Y3CbvO^Tz;$qybNrr~%eK zV-GR!*(lWJA8|_TZ=o%gTje+{;XlF?#a;%nfyijKq~ zCf}3?@X10636$;rx7BT6lTimR#X$m84pOt0&56%pr+?xTh$baGD{D+e%YA?U7p_6H@P}rJ&u|+Ry7@Zn`Z8wbc=D`Q;Yr2T7ub0) zpTB&b=;+FVB9^^0AJ;Q3>|>~apc&AD2D91iYvGghi~tQC>0A~44yEaMNb}=GFJbWR zZ|fd{lR`69t#<+)bw4{TbT56wB@9mg zIactz9o~}}EXiY>r2rL(d`Y0G;nrFi zX-}%&vkakMN^L(pG;m_L)o*k~GCKSK->;7~^jQWe*czi&p|5PgcMKqP`k6|f)j_9K zq}a+(_}g&}ff6_AV$uvZw2tDh@r&)&9%GQk{cdp?iWB*fe9%OS8BkLqSW+Bt*~o4W z%o;*MyB&Q0UiK`QG(C0ZSDvk7#1M*qiA3VKZ)i(mY>vp^{e(cD*@(y4ylyS+GwLAigT74@nzTeRl*}5hOEtsx`62l5&wk{{LtAX zFeIo1nN+m$WN$|iDKUUcIa!G!$_9ej|6|K|WMBKH@wT{OLDolpFb9%J#eO!k$2x_D zE>aQY7fBwa7U}^=Nw_4Kc1w4AMvgz0LrEM8s0m1Y9-s1L!i`klb36zM-Btv6ua*<@!$Hem2U;=A18clAgGgjRM{`NcL-!6dr(6FvhYDN4 zcYfP*`5p)=@3*c<#w5&ET^T(VPFKyoZoap>riKY3-~=j)2A5aQk6|VHNbMaVMJbuC zy|43CEuVzouHVXo3;Jp}Z@-cxpV`By3HG^QpP<@*LfB8+d3!A@sTT_}<#nphT4*mS zO7Z~6=Psi>f4uii(g)k5(31q{c`mGjVSGg@UYJ2^_Fj!{#z|U1-CzSA!NP* z^zO@t6uNm%S@cI4UTPVX*}(WnWA8Zwj15+W*;tH)8y$?w?kj{OCUrICLGQMPbg zUQT%ameU!cvQR(&eCuX8qck|M@{^9(x~68DKaHKnJ+|t;iCTvd2U$bG#J?OgVTmW- z?ra5|`?mW}kK&o6qtzoRJFdL>epdFNsKu+?b7h2yIWJ@vMR~ zhEA0TtbsX+Jc&pKT1LBZXKT-|+hh8Oi;e3DrRmdXyXz#fZ!_}rOw`u_)^- z$WuTWZ8teQ>Hkr>jsDez0Tv%Ok8w<;eEYBtGxx5F^nMl+WE``ZseS}}3_C?*rXuMfeg_BRuCxK92Xt3^2Q7Wn6X9J@!8tex3gS diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml index a5a333b605..6209e34978 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_list_item.xml @@ -2,6 +2,5 @@ - - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml index 2c862044c3..8c81ded7de 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml index 9861467021..7a58c30644 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml @@ -2,17 +2,18 @@ + android:paddingTop="@dimen/dp_40" + android:paddingBottom="@dimen/dp_40">