From 933d0baf678e445af4ca454246e1806b5c44175d Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Wed, 2 Sep 2020 14:52:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F=E8=B5=84?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/module_apps_item_app.xml | 2 +- .../src/main/res/values/colors.xml | 3 +- .../src/main/res/values/dimens.xml | 4 +-- .../push/fragment/MessageHistoryFragment.java | 4 ++- ...odule_push_message_activity_background.xml | 2 +- .../module_push_message_hisotry_fragment.xml | 5 ++-- .../res/layout/module_push_message_item.xml | 26 +++++++++--------- .../src/main/res/values-ldpi/dimens.xml | 12 ++++---- .../src/main/res/values-mdpi/dimens.xml | 12 ++++---- .../src/main/res/values-xhdpi/dimens.xml | 10 ++++--- .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/dimens.xml | 12 ++++---- .../src/main/res/values/strings.xml | 1 + .../navi/ui/setting/NaviSettingFragment.kt | 6 ++-- .../service/marker/MapMarkerManager.java | 3 +- .../module_services_marker_bkg.png | Bin 4061 -> 1969 bytes .../module_apps_ic_ai_assist_bkg_light.png | Bin 0 -> 1869 bytes ...module_apps_ic_navigator_applist_light.png | Bin 0 -> 2138 bytes .../module_apps_ic_navigator_im_light.png | Bin 0 -> 2439 bytes .../module_apps_ic_navigator_media_light.png | Bin 0 -> 2096 bytes ...e_apps_ic_navigator_navi_disable_light.png | Bin 0 -> 8659 bytes .../module_apps_ic_navigator_navi_light.png | Bin 0 -> 2447 bytes .../module_apps_pager_indicator_light.xml | 25 +++++++++++++++++ .../main/module-apps-res/values/colors.xml | 3 +- .../drawable-mdpi/module_push_close_light.png | Bin 0 -> 444 bytes .../module_push_activity_clear_bg_light.xml | 7 +++++ ...push_message_activity_background_light.xml | 2 +- .../module-push-res/values-ldpi/dimens.xml | 1 + .../module-push-res/values-mdpi/dimens.xml | 1 + .../module-push-res/values-xhdpi/dimens.xml | 1 + .../main/module-push-res/values/colors.xml | 3 +- .../main/module-push-res/values/dimens.xml | 1 + .../module_services_marker_bkg_light.png | Bin 0 -> 1811 bytes 33 files changed, 99 insertions(+), 49 deletions(-) mode change 100644 => 100755 modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png create mode 100755 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png create mode 100755 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png create mode 100755 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png create mode 100755 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png create mode 100644 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png create mode 100755 skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png create mode 100644 skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml create mode 100755 skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png create mode 100644 skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_activity_clear_bg_light.xml create mode 100755 skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 0e89455b55..02a1b7e671 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -20,6 +20,6 @@ android:layout_marginTop="@dimen/module_apps_app_name_marginTop" android:gravity="center" android:maxLines="2" - android:textColor="#FFFFFF" + android:textColor="@color/module_apps_id_app_name_textColor" android:textSize="@dimen/module_apps_app_name_textSize" /> \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values/colors.xml b/modules/mogo-module-apps/src/main/res/values/colors.xml index 7d6ca3277b..155daf49f1 100644 --- a/modules/mogo-module-apps/src/main/res/values/colors.xml +++ b/modules/mogo-module-apps/src/main/res/values/colors.xml @@ -16,6 +16,7 @@ #080625 #3E7FFC - #0C0C0C + #E6000000 + #FFFFFF diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index 679816b821..d335541a42 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -24,6 +24,6 @@ 78px 78px 17px - 60px - 60px + 55px + 55px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java index 94b2c4d7d6..21a37325bf 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java @@ -108,8 +108,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis if ( size > 0 && size < mHistoryList.getChildCount() ) { return; } - mClear.setVisibility( show ? View.VISIBLE : View.GONE ); } + mClear.setVisibility( show ? View.VISIBLE : View.GONE ); } }; mViewModel = new MessageViewModel( list -> { @@ -126,6 +126,8 @@ class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHis mHistoryList.setItemAnimator( new PushItemAnimator() ); mHistoryList.addOnItemTouchListener( new SwipeItemLayout.OnSwipeItemTouchListener( getContext() ) ); + mRootView.setOnClickListener( view -> { + } ); GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().registerMsgCenterListener( this ); } diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml index 80b95aaa85..5adad50e3d 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml @@ -1,6 +1,6 @@ - + diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml index e66b892add..06a0aff54d 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_hisotry_fragment.xml @@ -9,7 +9,6 @@ android:layout_marginLeft="@dimen/module_push_panel_marginRight" android:paddingLeft="@dimen/module_push_panel_paddingLeft" android:paddingRight="@dimen/module_push_panel_paddingLeft" - android:paddingBottom="@dimen/module_push_panel_paddingBottom" android:background="@drawable/module_push_message_activity_background" android:layout_gravity="center_vertical"> @@ -44,7 +43,7 @@ android:layout_gravity="center" android:gravity="center" android:text="暂无消息" - android:textColor="@android:color/white" + android:textColor="@color/module_push_panel_title_textColor" android:textSize="@dimen/module_push_activity_not_data_text_size" /> diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml index 29803b5e64..a01bc6197c 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml +++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml @@ -1,10 +1,11 @@ + android:paddingBottom="@dimen/module_push_panel_paddingBottom"> @@ -49,20 +50,19 @@ android:layout_width="@dimen/module_push_item_content_width" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/module_push_item_content_margin_end" - android:layout_marginBottom="@dimen/module_push_item_content_margin_bottom" android:ellipsize="end" android:gravity="left" android:maxLines="1" - android:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。" android:textColor="@color/module_push_item_content_textColor" android:textSize="@dimen/module_push_item_content_text_size" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="@+id/module_push_item_title" /> + app:layout_constraintStart_toStartOf="@+id/module_push_item_title" + app:layout_constraintTop_toBottomOf="@+id/module_push_item_title" + tools:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。" /> + app:layout_constraintTop_toBottomOf="@+id/module_push_item_content" + tools:text="3:20" /> @@ -98,7 +98,7 @@ android:layout_marginStart="@dimen/module_push_button_margin_top" android:background="@drawable/module_push_recycler_item_background" android:gravity="center" - android:text="清除" + android:text="@string/module_push_str_delete" android:textColor="@color/module_push_item_title_textColor" android:textSize="@dimen/module_push_title_text_size" /> diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml index 9188363b09..e7f1b333e7 100644 --- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml @@ -14,7 +14,7 @@ 18px 320px 180px - 21px + 16px 320px 160px 9px @@ -34,15 +34,15 @@ 100px 64px 24px - 12px + 16px 44px 2px 20px 27px 16px 64px - 100px - 12px + 8px + 16px 22px 27px @@ -50,7 +50,7 @@ 1.5px 24px 10px - 4px + 8px 560px 194px 266px @@ -95,4 +95,6 @@ 16px 12px 5px + 118px + 86px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml index 9188363b09..e7f1b333e7 100644 --- a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml @@ -14,7 +14,7 @@ 18px 320px 180px - 21px + 16px 320px 160px 9px @@ -34,15 +34,15 @@ 100px 64px 24px - 12px + 16px 44px 2px 20px 27px 16px 64px - 100px - 12px + 8px + 16px 22px 27px @@ -50,7 +50,7 @@ 1.5px 24px 10px - 4px + 8px 560px 194px 266px @@ -95,4 +95,6 @@ 16px 12px 5px + 118px + 86px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml index d4fd8152a1..31bb7874fd 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml @@ -14,7 +14,7 @@ 34px 600px 338px - 40px + 30px 605px 300px 16px @@ -34,7 +34,7 @@ 180px 120px 50px - 21px + 22px 6px 84px @@ -42,7 +42,7 @@ 52px 28px 120px - 180px + 11px 26px 42px 51px @@ -50,7 +50,7 @@ 3px 45px 20px - 8px + 16px 1000px 350px 480px @@ -95,4 +95,6 @@ 29px 22px 11px + 212px + 154px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/colors.xml b/modules/mogo-module-push/src/main/res/values/colors.xml index 8281819316..cd5df39f48 100644 --- a/modules/mogo-module-push/src/main/res/values/colors.xml +++ b/modules/mogo-module-push/src/main/res/values/colors.xml @@ -3,5 +3,5 @@ #FFFFFFFF #FFFFFF #B2FFFFFF - #B2FFFFFF + #999999 \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml index c0dd3e9561..6f442bde0d 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/modules/mogo-module-push/src/main/res/values/dimens.xml @@ -14,7 +14,7 @@ 18px 320px 180px - 21px + 16px 320px 160px 9px @@ -34,15 +34,15 @@ 100px 64px 24px - 12px + 16px 44px 2px 20px 27px 16px 64px - 100px - 12px + 8px + 16px 22px 27px @@ -50,7 +50,7 @@ 1.5px 24px 10px - 4px + 8px 560px 194px 266px @@ -95,4 +95,6 @@ 16px 12px 5px + 118px + 86px \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/strings.xml b/modules/mogo-module-push/src/main/res/values/strings.xml index a740d57bd3..e8ee4efdc3 100644 --- a/modules/mogo-module-push/src/main/res/values/strings.xml +++ b/modules/mogo-module-push/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ mogo-module-push + 清除 diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 1c2ccc322d..fe57ab63b7 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -149,13 +149,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { SettingManager.mapType = checkedId when (checkedId) { R.id.rb_navi_day -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Light) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Light) } R.id.rb_navi_night -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Night) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Night) } R.id.rb_navi_auto -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_AUTO_LIGHT_Night) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_AUTO_LIGHT_Night) } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 761a83dc2e..3621019256 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -36,6 +36,7 @@ import com.mogo.module.service.utils.ViewUtils; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.module.IMogoBizActionDoneListener; +import com.mogo.utils.AppUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; @@ -959,7 +960,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, switch ( mapUI ) { case Type_Light: case Type_Night: - if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) { + if ( !AppUtils.isAppForeground( mContext ) ) { return; } if ( mLastDataResult != null ) { diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png old mode 100644 new mode 100755 index f12819ecfc97f22ade5de6e7b2ac4b3da14defb5..2dff68497dfab483d4d5a927b126442067323f61 GIT binary patch literal 1969 zcmZ`(dpuNm8+R#6#$A(12<4JX8n4?RWA69+j2WX^?>1JL&A1sKro&XWx#LW!>qH7=l zL`!G5vojnHM}u=Gr~M#0ICz6+ArKf028Zp1L!mBEs1MY|CnO|hw-?IG3l$j1ck~F` z<%S3k{|bSK@e5&k!Rc@~Js^~aM8*dP^MfP!;pk&wsJL*nC=?kRj{bL8q$mOtcMunk zAta&kiFmREM@q%u6R^bNcv30~n;3}~m-gUB~Yc2_$1H)MMwe-vE)=LTTbQ5>0AYwkxAoZvjhdKC?%cyEt(+45RYSs zDO652sG;)|x|{eUGF?WbN{Q5TDl?P9%tGN42^1-Vm&4%ZvZD()!a~r8&Cdh(N%RaX zDH%sjVd}C94#>t7u?2ZpVltX2#*k9*3%NoS zOOOX1BHIuU0GjAF)bTimlnhj0NxDsd7EpC;?Uzbd(ZkfN5Y8A}yUrPY31$Q6xr&ZWa?zHyYSQVP%0;scb+wcr`#8@SM&8 z-s~KDQ93KY>tOK#^MI>tzD_<{P{08MentazfJHzfFGl6*Np1vR;Y|sX z%F;J5+_c%qc+1wUCMMgqnVOnHAZBLf02UUOmR2@4HroN9P^cYjmxH5=%U(BkcMnf* zU%vzXVFx23kSGk5&fsvlQ39b*m@1JC9kkgBkR&+73^-Qtt&(3XWmY18_JDM(gDsn$|!Zoe~X@ULP9@kfd zAAe1+SU;d|G4y&U&VM#AcJRC2n#9q?g-N?g>{0^0a?%LjH3)-L-xis-svZBlrU_{) zzdU?Vy5m;raVu`=yE5`wf!28V!;5>08pHCDQ}I5}(G)xXFA*kh%$fF$OEB8F%xMq8 zEudXfe??L)-S2(#w&$R~dNkqXZs^1JM}43f)q`svW)nNhlHB-*UPez`?z$u1X6BNy z&{F-i3>hdkkWu2^PT7}FSxBcxDgB$?c%0s~&{byw&ygw9tE#7DayO1XXIFJi&FTK|O9OQr+ab}_ zyV{41B6l;yi9P8nDG z)KS$Cl%lRF&;(g}e`jK{%KsE(|Ua%^#NUx9{D@%UIzGOKX3W4#WAk%^*v2I~CdoeRG+HHcI}z zEZ2PxdP_;a%3^1p3x|~HCu8=ydwYA|tn^aAT^s7Ea?bWyA9ctW@9H-7Y1c%TuJ68n zRy|Vvw!Pf>`!MzAnTn%fkanicPlJD~l_EYi-8HfmMSROE5T9(iQCnMEVcyP)%l=$% z;cI%~f#=iC?8mFb$Y(6=E=4HlSdmwF4v4&GY3er7iNhP-HdalZZ&gEz6Li5IVa z8CdAhrfFX7urkwZgM4!#KDG5?vfB9I^~T1==H_}ohtnl+`+GY^G@*Ct6hn@6$sYLN z>x(OmmGg6dB{67OwQO*uzFzdK zi>qnali?{YV{cRiz$;|$(|m@94|PEQHKQ_SbH*x0DTb7KYJ+X3Wb?D`Sp>aizN+e* zim|zAMGdV`&GRcor<#`w@>K6!9%kj-As>pn18seJ z>jx(0=jDCSFKe?#FGa)rL-JM)ZNKK&c<1ZM{~5&-LRZ(EC``>xe}`;88`l#5D{-G& q$~=gg;yKPpMgI22a00001b5ch_0Itp) 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 P00000NkvXXu0mjf0$0LD diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png new file mode 100755 index 0000000000000000000000000000000000000000..402c1def0125339979c4f3a3b31832e2cb9d6a3c GIT binary patch literal 1869 zcma)7X;4#F6po^T3m_^kltrz83pC175fDoWA|s6;pr9mxwrrLPVhD?Xs3o9aKm;Wk z5Fw+oDTrVKk+v+sG8lFgc!7k55V8Wn5RyP|c{3en`ln~+efK-x`R=)Q=DeAk;fZ$B zUT3flfk0@xpFo`kEB2pHO9LQzgLeP|v2wGghmR{r|9_;UqyRG>j|UhP6$LOqKc7OO zeAyvBJ|3jkuV4RHbaiz_qtRhuVUdxMPEJn8k01B-^~GQ??d|PMCbPM@xvQ(IrKP2# zql3X<^!4?DhQ-Cj!^6Xcg@u)sl^`XP$xoj?EiEmrsi~n-seC?PB9V-Zjd8hL2!hyb zc6WDoe}BJNEEWodv$M0))6-K^Q0)YVLzz;eD z4v1VX2MGJ;=jQ=gSPr0r_4DV?fXvO!!5kPA3I#|3ffbMf4@iLsn->=sVFF6Pqf)8V zYBj9D+y9He2FyyO5|{yj4X^?uFu+yN9422P=nr)GAQ=Bm0fDPu;?mL*&^KkNE`#A! zUp94<0&XWo2z+W9#VTdD{D|KQ{0}LSjnltu#VL#_ijgnRm0ZbMEEkKOm7FzkKzk zuCAWiK!4Zt+wXt8f8Wv5+t)Ynad>0|3>9K6$0&%gF*cjS;f#-u|Hb7_Oz?PMu#+e1u|z}svzyOuXGEJ8m|8d6^;GZJ(pq_@ zyfXIXrAX*a{{ZF9n@6$Tw4heg{SgqNJ6%gJtJrHlY4@&)Q^J@~v+Q8;&Wp*9$JZAP z#yG_=4R%$B7K9s5L3{ZS8mg3X=zz$GdL9XOV^&<_uv7Ti}3h9>v~NKfu&SE(!TqPyZW>eeT{s=5=I3rTK)SEQ%{rvdS;VOl5t z+eV4pD2e^Mcg8jmw#T8tfHkeCXs}c8P^J)ueqc^{X}3V)e+`vA=sQHu4+nvrhyI)|OD{EeCFUy&JlZ@dJs)c2 zlvIIu#tW${KqnB13>;G?i;DA;8ygb^=!Ihe#=T^j1yK`cPG*$QazC(xq1TSagGbXf zam)}C*-V_L{O8L^q8pAk`$|j)74k%&vF;SwzKC(vT&+iN!YIX>%Z8%DtfQ z!lW~?AGwD8ok!MAp%>`X!V>#B>r1hzw9QLNS@I`2tts{Ty>!oOs$%gGv!4i!B&uF7 z-ESl!qR<7)OLP$EqU52iF0aWFA&R-8A>`d4ViMaZ&3O^8^O4LwkZ|o&pgtan^)nvK z%Nf+Dco*SkV)(pPS$xXE#VDG}4(Mzr1=Fkd`Mb**!xR2#X2iFoXk`8cl3vlmbp2Uu zt&)E9Zc}E2#iky{^5f<1 Libhp^A9UkyTJcZ` literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png new file mode 100755 index 0000000000000000000000000000000000000000..0438b180a1af9ebf4f1637addd88ee6f5b95e72a GIT binary patch literal 2138 zcmV-g2&MOlP))t;zJ)D0tXMS_e%-ug8$#dA%d98y1he8q#T^GA_&)lpw(wczMm}Vf_(2FUKWbd@5#5k001HV z&L{w8O2^>bF>UQV<>h#XcMDXZQ@%tXlI0bszKTARt`A=@007{@ySf+_7h3&|?+zVV zKMW!~jq=ebJrw@^{N5)zR%2P0B9JD@ESqxi*-C(iNOvCc6ms6gmg^0Zle#5;Rw zT4@#Khy>DIaAZ+T)r~-^Z(_ia+p?})Q(E(CHI|Q*w?V+oE0W$+?UIl{M{N%RQR!ik7s#>;xTW)K8+ED9|z z%;M+Tu`W=M^^l5Tz!sP+>46G%YZ@D0>!PYQeqChvbr`2#Hw6o<8aG!ViE_NVLXN9jEd1`2ooh<$BwJ_?}1A)O6C9!7I zw_@FtDDrKjn_1VTN8hZmkE(r*0d|#v6q3jptU5N(7xt_Rtqja2*O$e5V#%~Tgrj9u zy6zO1HS1Iu=R;1)ERS{6;)~==q=N*Ej--t%Mmy$R{5sPFs|Yd0*mC`ljWIuQl8233 zypEZt)&m-)qXre^NGHU*`E^=w8YO}0RI~i!&U!BMc79zJj0F2Zk4sBOC)SbhHU{yw zF$~7(9=aYP8q|WxU9u(XDD0Sb8=I=mkwyrCYOdHe>zNJKK8DF_tm#RWNUk)duwfl- znRkj|C`+SZJ}Bv`%+k?mIFivx*~II*U)PJINJkwfJJ!*bdHXy}h0C9%yDT7nlG|2z z$(nVvk8SMZ^;IM3=te$SS~@20Jh8NamaNm#EuzZoczyFwU*l-G#xUjG1L^mVp6=p_ z#U<%8`0CNw+@5thrq3Bk<&8}T*#KM6fY{1%ybf@>>r~m~k$xyWKiJo_V_l%7t8~jb zo+w>qAOWJ*9nWy4!`|Mi3+w3IN#%}B|MHTkT#fI+*mXrWyVx{v(FVW8dElq(f& zmQKe$b&Tk+VcjCOanG+ash2moMq}*bz`AuOWuJ!$8>&*ZbWCF*-N?GbNXkAB!?Yox z9>Zi0RI*vm4$+9bje8yj>6j5QBlbZD)~!L7eJa=V;lE*)6}{yDd=52I=w~Nn~}45sp(V9%jaYaM(pzIT|#N3QqWuB%j-Au zt%J8TfJiO6zKS+bo=@*zl43rvMWlHIC83cs`=sSWGaoz&#bCAq~gS*zMIUFBrV zCAq~g)O{>0KRI(rt}#s8b5avGZ`yXeZk$%N&fB=Ihk1H>M5m(5(w9;i($95Uuo72ve3$+2G+y-3_-H8o_6cai^XF-c-6d+ zUel^I*s-%V>m0|+dfp(A=&oU`pJqN|5F=GUTDFxG=7 z)V6)460c$-K!DgeGJ2?3tOv*N!FPt0JtUNP;Gge-W|3G202Ix`JHtR&nEbo|4t)J@ zgZqlaIv~K%?zQLQ-3w-HKmcFAgP$!5>i_`F{*74Rqu*21O#N|W{IQS`@GmYuxqKCgmP#5%}>NF{T^FMavwgTFv47B3yT`0!`{K;MzY zcX>12Wm%<5&G%7irrE#$v9+>v<5r`1!wWF*!2^Fq<-nGi8=`#-cJX?~gbdQGQ@|hq zh~__gAKw1OC^Vr3P2kW<`*|cX2@Du`(Yd?lflb{jS-Cx6T*ju#eQJZBe)jGo=b;s! z#7-&WCa<^v47_zWy}V-1vdZn9bFqq@6CJNhHB%Q?>VMRJ{`2@7NA`_C3%Del*yNS5 zy)G_7u)&IHDueh}?U%2c4eVK0To?a!08E)|2f_03AIzEyqc9b& Q`~Uy|07*qoM6N<$g7gP1=Kufz literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png new file mode 100755 index 0000000000000000000000000000000000000000..e1d31d23fc28f0d3f431a63e7c82f7a5c856ae00 GIT binary patch literal 2439 zcmV;233&F2P)ah&fCm6Gv~~?`@(JD zoOJizz31NhpPAqM=b2~D6nN`+>v(e=w1QU;cJOk_p;apaw=D=cy++38Duu}m7WTJ_R`7E1s|bKRSJ`tB)fFe<)V-H z-XSi7QI@UNVYx?l3?HFfOft6qkLG|4BM^uJy{d4Se~Y&E*9tXHa|xJsV>$DVC} zGs_od>A$~p@&GoVA|#jm1`ROJdVOcr2B@5-Y4_N&kR{Ag6yVJUrwfOqQa-Mw!t>nc7>IRIGSKWA>VE$EbksLslaxrT-9AjLtKYx&+SD%dxB2Co_b*$H z7-p%gms^Iw6kMLxJln-z;>J1?8{452!@w1oI_ZfD@$ND-jf?O3f2k$EE_naIkKlc=)z(VR%?q@FcT%(qgKi zVqHT=quw`#R>Q?QRjFn(HbcpJ>D#Q#FOhYbKaNP{afz&3+RSgxHMz15NRs$-`1I(D z!GHY)3VA|q?!SNWn)4wD3>uhqTcXH!k?z8}q!_^T$@EVSf970!KKmUoj z30W4=mUX6@LODYK?{J;@0@*7@qjlK~aEDos9NUi@@o-`iqvYu2khtCsmTtS2eON4q~de{SUVbqNr{So4$@>8b7mV+=`bWF1!4Z5>wB zNpJFX2Ge=mIw6Tl$>eJ7CyyQ;dp&ciSmFNAi+Mdk0wd(V0^f(KxoT6EaPJPaeo zDW7T>ul_wT)9D~hI<{b)+})-*4+Ah_>ecwWy-0r z{;r=A)4_Bgomn?aHx5#6IY*`pD;Iy)&yYdSg)>485$aht$MnJkj9bo;HK|ShUYs5W z%!uikP=ZN1u+FY-(=O-O#^1AZOcDUbY46{jbY|VT!@A8)tFr3-Jv%3&>|;;(Y?f{@ zQ0Hl&TOP(H6xNRG^M+WY&8zx7H7+ALxJ|qKdOLq75H9ZfsjoBjh#{R>CzqOc&BL&z z=I#DY=*WvBfowXMgb7Tdk@XfcDYrZfTKl`tTNXsVq)O>X0f#k3N9Nsgj&1$j=dBA} z_S7OOfo>h^&Z!UAoTEOpH~V`>ZdvHENUgT)PZ^wUtT*RvoN|tC{w{c9^v=Ey0Z;1_ z=9?ePtdqfQ{HFd|mvba^<#|!>?;SZ2ZHxj4c$#RicVZyxsAX3wKC_N>bAaHtWnGo-VOxJw6hjh~dP9t(qh|!A0kZ(X zvrNdHSSQyG>zH3B2>1x$aZJp`?26JH+I8oj8F|&udW10c2jsQy!aB8ao2LA_05HOm zn3Z1C2NzC6$HG2QIw(D-6Nja}2rOc9-);ARMWJpNFyfxm`JK_J!pA}hn zrFCms6Ps>rsmtd$h<9I0A|=WxE{RD%LO`%j+oG+pM1+{K&&fKe$6cnH1r5|py)EJg zTT5aszn-MEV-O?+m>D6ZIoYfZnLw#|!ija$IP14(y*a<0tb=$U5=i1kuv8^xcWJ=W z@_6;RONW|Yo^?}^qa@SEo+d@)eoIcQJ5NTIYuz+?;=z6^DJ*yK*q2ou#V^OYDWMv# zlQF&G!n%8Gvux|8`rMRS`Fc}yDU=LSax7MWA$QhYbB?aQPHOgOv81$6l4ef9bM5Z^ zYMWoD7QSBkoU*Up#n-3xYX zz>vH4$>YPqIsimddv4F`-B9z{ASEFYAL*}H%i$|N;H_^j%PC!I{~WDl zqN)2ovs0CB-D;F?c!7Wq5B`qs!JF6bMqrND>oyYEqIVPPCSV8vM`!N&16M}!y= zB;vBqR};)hmdMM_yEcDp@7fQE&S1c_i`SLU>CHa;>z{n;WyJYu*ePY*ic>xdy0;f76KHQVd*A_yhvwX(aB z3(re^FO_ZCUguZdo@I?VKS{}vu8w$4yk4Uy#X;w-) zlolUoGjG|}F0gIXW?#NwHn7)SaY6jo0a!KJEd;B_{{iYrrx?~cEYbh~002ovPDHLk FV1gx7)eQgu literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png new file mode 100755 index 0000000000000000000000000000000000000000..9c4ddd35f3fdc0b96e1b1e9b804d5b86f55cbad4 GIT binary patch literal 2096 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 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml index ff5c5d096b..0f4ba56af4 100644 --- a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml @@ -1,4 +1,5 @@ - #B2F5F5F5 + #F5F5F5 + #333333 diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png new file mode 100755 index 0000000000000000000000000000000000000000..d25aa13032a3b8caa2dfdc9e22b3fd07ebe0633d GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81SkN}?$S0MfD*|UomFWv@&J9q9p zc<|u<{rmUs-Mb40KoKASa^WHnaR_N_Y;0p=og`s24B|0LN3fi7ZX@^oP@C510I&c3p?(( z>!$wyZy)NS8q_jZUBUUKppc-i!1Bt_^4Qp?nKCEr{UWXbhA{i%h8=qVScsp;?1-mJ06&O4Ro+ + + + + + diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml index 54e15b4ecc..d55da005a7 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_activity_background_light.xml @@ -1,6 +1,6 @@ - + diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml index 1ebc40fcc0..f3c9b8e297 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml @@ -2,4 +2,5 @@ 16px 12px + 24px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml index 1ebc40fcc0..f3c9b8e297 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml @@ -2,4 +2,5 @@ 16px 12px + 24px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml index d28982bd82..7aabd7e78b 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml @@ -2,4 +2,5 @@ 29px 22px + 45px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml index 86bf425d17..7a6ecee38d 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml @@ -1,6 +1,7 @@ #333333 + #333333 #666666 - #666666 + #999999 diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml index 1ebc40fcc0..f3c9b8e297 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml @@ -2,4 +2,5 @@ 16px 12px + 24px \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png new file mode 100755 index 0000000000000000000000000000000000000000..8044b0458ff27b4405cbf8106b11144bd295a239 GIT binary patch literal 1811 zcmV+u2kiKXP)mRk!4?xikzh#CH%$zMSb^|B1Y#nH27@oY_-3LnH6cpSAaMf% z%A%qVs0ipwEuauZVgWS}N?T^_v@@NVyWhm~-DU3n%}ht5^RzLmt@ED=W}nzo_)6w!76qRPy<#S_C*F}53zUIIFn!!b{qny*eM=^ zo6H@Fu0_4o=&R}H?{4kkiZ zr>Bxlu_-G~&~Snhd|F5)Uk0^rZAeue;-b&9Q5w$DC^U75Ltt8%iN2s9Eh-Diy!{Mw zuK9r!>q2OPZak? zQE^0@iW9Qp?5~f5A8Crd!^PB@E2p-KJI<`lP=`2-+;K%C_>cB6kxFdfteiug8tKoM zphl>Vyhg_v>IByj=7hQ7q^y`ryp9^7A$zX)!dkphtlD&(Xu^p(b{HC9D9lC8KzE#3 zn_==|IKhI$nBB7&Zf+`Xrg-}UKXd}#C&21(#Pnl zfmIvL20Bj27Wy))!&ID<&z^$ZaOv9yZ*`VN@lZ#A>=j^dI9GC~#p$botLw6M7ztqv z*h#B8HyhA#Zhh%Yrj!>Mk&&i>i_<1bY4cKWg^4B@!AT@?z)pCpvrUv4I?f3+lBuX8 zkpk}T%2orRXrq{Lj5GoH%U-VY*c6qKOwpW744L8og!I>QU0A)fxzvsXE3vunA-0dc zZJ?_&S5BRnR-73|V(I{l?ko)_rsre>3s7eN+69MJ%@t>;lPoyNL!FFqq#vM#`J>2q zE@`58HHv|gIQ}1K0SHa*b*dxV26uJtE1hIf=Z=%O_H)`P#11CyEniUJbl)GIw(~G$RcbKvR2H z{&&8FZG&4X>FNkf#ql@VyD*^(a9;|GpykSTuU8T80Vb7T105%GS9fBEE+YHVTHLxd zLC4IurB%+Z&KqZ_lez49=s-#X((on94*_U-XEitJy=|aP6sHZW+9X~|?Rx_C1&~xt z-kxePvyIU9+e=oHd)Ll3FRAJf$6wn8ZAe&vr1_w{j{32CLeP0{f2FH|fs^&%;~zpN zK7FC0Zyu;G-1vTqX$|zGPI=+zHgLyDyv%1#2YQrr)@d)@`jLW?*47nErcakYFRiXK zv?19I^)R1 ze%7WVTcK;?qtV0IKDpxC2D|HICV6zr3h2V8c;d`RQp+HY*$xPQGBACHbf=-tTsc*p zY_mb;+@W<4#=D#GDWrBDILnD5_EZ4w$Aomj;*ZwEJ`>`l*g#ChkA1op7UNxQcy|Dw z;(C(kdPJ+Fwh{lzcDy~@zx2W@v18nA(ZdG(-PnnXyH_nkWnFkjGu}y3Nj;u*975w? zSFb_aa8mTZ1MpztOSb{WjXv}+^x_qrc%=%f2Ve06Xy-9IsV9L3F+r{PxbWtc!d?5e zLCT+4kIFjniV$8&V1DfjMj4+HOrJ;;r43q5yGM4|D>v~zYHL?u4Vtp5(mx`2e3!w; zs5Nbc?$k+hUvi@>`wDLJRq}1dj#ce~$QPIM69pUOzZyh!y4$KM`}Smq>eIIU;&$D2 z_ufOlg)HW-5N5_2>t@IFNo89!`dBY^Wx#uuRH{>7H=AEwDo)7x)9VTg&wq~7k?Oh` zgwXYE$-Ro_8VV=&|HDsDD;a!^eIfj}$gFhx{R<$*E``