From 3c8745ad8ab0fe0ca80437e2b505961658578d78 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 25 Sep 2020 11:15:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=AB=98=E5=BE=B7=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E6=8C=89=E9=92=AE=E7=99=BD=E5=A4=A9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=202.=20=E8=A7=A3=E5=86=B3=E5=90=8E=E5=8F=B0=E8=A2=AB?= =?UTF-8?q?=E6=9D=80=E5=90=8E=E6=97=A0=E6=B3=95=E6=93=8D=E4=BD=9C=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/map/impl/amap/AMapViewWrapper.java | 1 + .../extensions/entrance/EntranceFragment.java | 11 +++-- .../panel/fragment/SimpleSpeedFragment.kt | 6 +++ .../panel/presenter/SimpleSpeedPresenter.kt | 19 ++++++-- .../module/main/cards/MogoModulesManager.java | 7 ++- .../MogoRegisterCenterHandler.java | 3 +- .../java/com/mogo/module/map/MapFragment.java | 2 + .../module/push/PushHistoryUiProvider.java | 6 +++ .../com/mogo/module/service/MogoServices.java | 1 + .../onlinecar/panel/IOnlineCarPanelView.java | 2 + .../panel/OnlineCarListPanelProvider.java | 15 ++++-- .../panel/OnlineCarPanelFragment.java | 19 +++++++- .../panel/OnlineCarPanelPresenter.java | 44 ++++++++++++++---- .../drawable/module_widgets_app_body_bkg.xml | 2 +- .../module_widgets_app_handler_bkg.xml | 2 +- .../layout/module_widgets_app_entrance.xml | 34 +++++++------- .../src/main/res/values-ldpi/dimens.xml | 2 +- .../src/main/res/values-mdpi/dimens.xml | 2 +- .../res/values-xhdpi-1920x1000/dimens.xml | 4 +- .../src/main/res/values-xhdpi/dimens.xml | 4 +- .../src/main/res/values/dimens.xml | 8 ++-- .../fragmentmanager/IFragmentProvider.java | 2 + .../IMogoOnlineCarListPanelProvider.java | 2 - skin/mogo-skin-light/build.gradle | 1 + ...odule_ext_dw_navi_info_panel_bkg_light.xml | 9 ++++ ...module_widgets_app_handler_close_light.png | Bin 0 -> 280 bytes .../module_widgets_app_handler_open_light.png | Bin 0 -> 396 bytes ...module_widgets_app_handler_close_light.png | Bin 0 -> 280 bytes .../module_widgets_app_handler_open_light.png | Bin 0 -> 396 bytes ...module_widgets_app_handler_close_light.png | Bin 0 -> 599 bytes .../module_widgets_app_handler_open_light.png | Bin 0 -> 616 bytes .../module_widgets_app_body_bkg_light.xml | 9 ++++ .../module_widgets_app_handler_bkg_light.xml | 9 ++++ .../mogo-module-widgets-res/values/colors.xml | 4 ++ 34 files changed, 174 insertions(+), 56 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_open_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_close_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-mdpi/module_widgets_app_handler_open_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_close_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_body_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index 2c70ee3345..9ee5089486 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -202,6 +202,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void onCreate( Bundle bundle ) { + Logger.d( TAG, Log.getStackTraceString( new Throwable( ) ) ); if ( mMapView != null ) { mMapView.onCreate( bundle ); Logger.d( TAG, "map onCreate" ); 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 83e4e1752c..b304733aea 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 @@ -172,6 +172,8 @@ public class EntranceFragment extends MvpFragment { try { - IFragmentProvider provider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext()); - provider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null ); + if ( mMessageHistoryPanelProvider == null ) { + mMessageHistoryPanelProvider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext()); + } + mMessageHistoryPanelProvider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null ); } catch( Exception e ){ } @@ -806,8 +810,7 @@ public class EntranceFragment extends MvpFragment(view) { +class SimpleSpeedPresenter(view: SimpleSpeedFragment) : Presenter(view), IDestroyable { + + companion object { + @JvmField + val TAG: String = "SimpleSpeedPresenter.kt" + } + private val handler = Handler() - private var mogoApis: IMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(view.context) as IMogoServiceApis init { // 注册相关回调，监测速度变化 - mogoApis.registerCenterApi.registerMogoLocationListener(MODULE_NAME) { + MogoApisHandler.getInstance()?.apis?.registerCenterApi?.registerMogoLocationListener(MODULE_NAME) { handler.post { mView.refreshSpeed((it.speed * 3.6).toInt()) } @@ -38,4 +46,9 @@ class SimpleSpeedPresenter(view: SimpleSpeedFragment) : Presenter mLifecycle = new HashMap<>(); private Map< String, IMogoMapListener > mMap = new HashMap<>(); - private Map< String, IMogoNaviListener > mNavi = new HashMap<>(); + private Map< String, IMogoNaviListener > mNavi = new ConcurrentHashMap<>(); private Map< String, IMogoLocationListener > mLocation = new HashMap<>(); private Map< String, IMogoMarkerClickListener > mMarker = new HashMap<>(); private Map< String, IMogoAimlessModeListener > mAimless = new HashMap<>(); diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index 353af2b392..f213a11094 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -16,6 +16,7 @@ import com.mogo.service.MogoServicePaths; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; +import com.mogo.utils.logger.Logger; /** * @author congtaowang @@ -60,6 +61,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements @Override public void onActivityCreated( @Nullable Bundle savedInstanceState ) { super.onActivityCreated( savedInstanceState ); + Logger.d( TAG, "onActivityCreated" ); initMapView(); } diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java index b2f7ac35cd..0b5b84d790 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java @@ -36,4 +36,10 @@ class PushHistoryUiProvider implements IFragmentProvider { public void init( Context context ) { } + + + @Override + public void onDestroy() { + + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 7bad54b25c..11f2adf816 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -956,6 +956,7 @@ public class MogoServices implements IMogoMapListener, @Override public void onStopNavi() { + SpStorage.setNavigationTarget( "" ); Logger.d( TAG, "onStopNavi: remove MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH msg" ); mHandler.removeMessages( ServiceConst.MSG_SCHEDULE_CALCULATE_NOT_HOME_COMPANY_DISTANCE_FOR_PUSH ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java index 47b330bfd2..9f361462b4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/IOnlineCarPanelView.java @@ -22,4 +22,6 @@ interface IOnlineCarPanelView extends IView { void renderNoNavigationInfoUi(); void renderErrorUi(); + + void removeSelf(); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java index ec0a404644..74448a1079 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarListPanelProvider.java @@ -30,10 +30,14 @@ class OnlineCarListPanelProvider implements IMogoOnlineCarListPanelProvider { @Override public void showPanel() { - if ( isFragmentExist( ContainerHandler.sAttachContext ) ) { + Fragment fragment = null; + if ( ( fragment = isFragmentAdded( ContainerHandler.sAttachContext ) ) != null ) { + if ( fragment instanceof OnlineCarPanelFragment ) { + ( ( OnlineCarPanelFragment ) fragment ).refreshPanel(); + } return; } - Fragment fragment = new OnlineCarPanelFragment(); + fragment = new OnlineCarPanelFragment(); ContainerHandler.sAttachContext .getSupportFragmentManager() .beginTransaction() @@ -41,15 +45,16 @@ class OnlineCarListPanelProvider implements IMogoOnlineCarListPanelProvider { .commitNowAllowingStateLoss(); } - private boolean isFragmentExist( Context context ) { + private Fragment isFragmentAdded( Context context ) { if ( !( context instanceof FragmentActivity ) ) { Logger.w( TAG, "context is not a instance of FragmentActivity" ); - return false; + return null; } Fragment fragment = null; return ( fragment = ( ( FragmentActivity ) context ) .getSupportFragmentManager() - .findFragmentByTag( TAG ) ) != null && fragment.isAdded(); + .findFragmentByTag( TAG ) ) != null && fragment.isAdded() + ? fragment : null; } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java index 0975324f90..004a1944c9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelFragment.java @@ -47,7 +47,7 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On @Override protected void initViews() { findViewById( R.id.module_services_id_close ).setOnClickListener( view -> { - MarkerServiceHandler.getApis().getOnlineCarPanelApi().hidePanel(); + removeSelf(); } ); mList = findViewById( R.id.module_services_id_recycler_view ); mRefreshPanel = findViewById( R.id.module_services_id_load_strategy_container ); @@ -70,6 +70,10 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On } ); } + public void refreshPanel(){ + mPresenter.refreshPanel(); + } + @Override public void showLoading( boolean visible ) { if ( visible ) { @@ -147,4 +151,17 @@ public class OnlineCarPanelFragment extends MvpFragment< IOnlineCarPanelView, On mLoading.setVisibility( View.GONE ); mErrorPanel.setVisibility( View.VISIBLE ); } + + @Override + public void removeSelf() { + MarkerServiceHandler.getApis().getOnlineCarPanelApi().hidePanel(); + } + + @Override + public void onDestroyView() { + if ( mPresenter != null ) { + mPresenter.destroy(); + } + super.onDestroyView(); + } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java index 1602c21da7..ebdc0280a6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelPresenter.java @@ -7,10 +7,14 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.mvp.Presenter; import com.mogo.commons.storage.SpStorage; +import com.mogo.map.IDestroyable; import com.mogo.map.MogoLatLng; +import com.mogo.map.navi.IMogoNaviListener2; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; +import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; /** @@ -19,7 +23,12 @@ import com.mogo.utils.network.utils.GsonUtil; *

* 描述 */ -class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implements RefreshCallback< MarkerResponse > { +class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implements + RefreshCallback< MarkerResponse >, + IMogoNaviListener2, + IDestroyable { + + private static final String TAG = "OnlineCarPanelPresenter"; public static final int LIMIT = 20; private RefreshModel mRefreshModel; @@ -31,19 +40,18 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement public OnlineCarPanelPresenter( IOnlineCarPanelView view ) { super( view ); mRefreshModel = new RefreshModel( getContext() ); - mStrategy = OnlineCarStrategy.Default; + MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this ); + } + + @Override + public void onStopNavi() { + mView.removeSelf(); } @Override public void onCreate( @NonNull LifecycleOwner owner ) { super.onCreate( owner ); - String json = SpStorage.getNavigationTarget(); - if ( TextUtils.isEmpty( json ) ) { - mView.renderNoNavigationInfoUi(); - return; - } - mNavigationTargetInfo = GsonUtil.objectFromJson( json, NavigationTargetInfo.class ); - loadOnlineCar(); + refreshPanel(); } public void nextStrategy() { @@ -55,8 +63,21 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement } } + public void refreshPanel() { + mStrategy = OnlineCarStrategy.Default; + String json = SpStorage.getNavigationTarget(); + if ( TextUtils.isEmpty( json ) ) { + mView.renderNoNavigationInfoUi(); + return; + } + Logger.d( TAG, json ); + mNavigationTargetInfo = GsonUtil.objectFromJson( json, NavigationTargetInfo.class ); + loadOnlineCar(); + } + public void loadOnlineCar() { if ( mNavigationTargetInfo == null ) { + mView.renderNoNavigationInfoUi(); return; } mView.showLoading( true ); @@ -92,4 +113,9 @@ class OnlineCarPanelPresenter extends Presenter< IOnlineCarPanelView > implement public void onFail() { mView.renderErrorUi(); } + + @Override + public void destroy() { + MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoNaviListener( TAG ); + } } diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml index 625e224fce..f72fea0bbc 100644 --- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml +++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_body_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml index b010e4976b..58689bcc7f 100644 --- a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml +++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_handler_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml index fa0ce143ab..5b874cda9c 100644 --- a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml +++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml @@ -1,31 +1,29 @@ - + android:layout_height="wrap_content"> + + + + - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml index 7d4932a5ba..d23e58d061 100644 --- a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml @@ -3,7 +3,7 @@ 22px 15px 2px - 505px + 503px 501px 20px 27px diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml index 7d4932a5ba..d23e58d061 100644 --- a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml @@ -3,7 +3,7 @@ 22px 15px 2px - 505px + 503px 501px 20px 27px diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml index e0aabc6db4..a86836448a 100644 --- a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -3,8 +3,8 @@ 40px 30px 4px - 836px - 1000px + 906px + 1316px 37px 50px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml index e0aabc6db4..a86836448a 100644 --- a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml @@ -3,8 +3,8 @@ 40px 30px 4px - 836px - 1000px + 906px + 1316px 37px 50px 71px diff --git a/modules/mogo-module-widgets/src/main/res/values/dimens.xml b/modules/mogo-module-widgets/src/main/res/values/dimens.xml index 43846dd773..d23e58d061 100644 --- a/modules/mogo-module-widgets/src/main/res/values/dimens.xml +++ b/modules/mogo-module-widgets/src/main/res/values/dimens.xml @@ -1,10 +1,10 @@ 22px - 30px - 4px - 505px - 1000px + 15px + 2px + 503px + 501px 20px 27px 71px diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java index 548e0f1e0d..d7e96a313c 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java @@ -17,4 +17,6 @@ public interface IFragmentProvider extends IProvider { Fragment createFragment( FragmentActivity activity, int containerId, Bundle date ); + + public void onDestroy(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java index 16f68b3e74..6daf1c858b 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java @@ -1,7 +1,5 @@ package com.mogo.service.strategy; -import android.content.Context; - import androidx.annotation.IdRes; import androidx.fragment.app.FragmentActivity; diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle index cfcc4a9d2f..9e7cb49f24 100644 --- a/skin/mogo-skin-light/build.gradle +++ b/skin/mogo-skin-light/build.gradle @@ -43,6 +43,7 @@ android { 'src/main/module-tanlu-res', 'src/main/module-commons-res', 'src/main/module-media-res', + 'src/main/mogo-module-widgets-res', ] } } diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml new file mode 100644 index 0000000000..b7a7dc2898 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_dw_navi_info_panel_bkg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-ldpi/module_widgets_app_handler_close_light.png new file mode 100644 index 0000000000000000000000000000000000000000..6f4b2587ae186faa312ca520932382c45d192f0e GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!6#=yXs@#Xw?AcwIy$lZxy-8q?;K+Yvk7sn6_ z!Q=!7<}(WW>^3FX89le}U=Cwmx}WjoVg*M5j@AHYcT6Oo&8xJ88{>A&lv zfZc8N_xeygv{u=^-S~pz6KJq>0CuJ!wL&%1w?- c9%2j(I!CkPx$MoC0LR5%f(QmanHKoo7a5{Im-0*B~B^%K_CKtSVGvVQ;?hk}r>SyGK7U}@5N zz5zi32?Wv2aL&M;%xs5d6DDcz+4iGXi#mvAh7n69CZdjZW7Qh;)WCI@wm6U6r*WGDUw+E$Y=3|}18dIA@P2AAt~ zC*Oz!muFF#qn3g%LU4qwUjk##Go1Rl@J0^3FX89le}U=Cwmx}WjoVg*M5j@AHYcT6Oo&8xJ88{>A&lv zfZc8N_xeygv{u=^-S~pz6KJq>0CuJ!wL&%1w?- c9%2j(I!CkPx$MoC0LR5%f(QmanHKoo7a5{Im-0*B~B^%K_CKtSVGvVQ;?hk}r>SyGK7U}@5N zz5zi32?Wv2aL&M;%xs5d6DDcz+4iGXi#mvAh7n69CZdjZW7Qh;)WCI@wm6U6r*WGDUw+E$Y=3|}18dIA@P2AAt~ zC*Oz!muFF#qn3g%LU4qwUjk##Go1Rl@J0Px%5lKWrR7ef2R!dI9Fc8hBYmQKfo&YInyWt4!6+nPE1KTdS1eM?bYUdGq4&j1$i@jVOvT*aCJ4!*Ia5gPhG~LCAjl{XRYE z9F+~_BHaHh>Jt$;8ja3H!+1Q7^ay4A!{P8Mq8LHOt+PWJmeC~pzVE*%^IS#9IF6s) z4Z0^H;IU=P*Fiid;Fk10=F{mkq#*gB6b?pUVfRb{YJmuVqdFds8|b}WFJ3N}pH`p> zKsu8oxds?R1lj;OjF?$bC0>gd=EQKPuGi{PmFb{Lc~AxHr~(tQ5)^a=7zDuu>{*sw z*}!6QhQr|?P17#~(6fm(j0z(b*X#9$Ti?ViG6IZYI~I{Khk4#=wffeWpV(#v!UjLXM z#8+h_ODe%fD!~WL(QcE;6EZLtbTr~JQ%^U5wHDO!g&V)>CN;QAi*w3j-+1VtKUTPbu zpyv39s<=*sAj0)he5K2?MCIatLHazlN@?4I!A=_yb|K=lIuZT{Q6oaS#&&e2ot2=5 lw+rJMN&N1({PNTV{RP!A7~@w+Neuu1002ovPDHLkV1mc`3G4s> literal 0 HcmV?d00001 diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable-xhdpi/module_widgets_app_handler_open_light.png new file mode 100644 index 0000000000000000000000000000000000000000..56f85a5442227de91bacd5450afe07ab8bb8e1e9 GIT binary patch literal 616 zcmV-u0+;=XP)Px%B1uF+R7ef2Ry$6^KoIq(qN0u!1py~O&ZmVwxdIf3d${Bf{11SHl9GagCW(E3 zG(mBZ1CW$4X20Tit~_1Kl7R*UktmHu5lSfbtwfuo4+aAt2FxZKvq?PfcDoQxF3ExUb0aCtaj$b^X@|q% zjTEg8f*^2oXdb5q*xX}KXrgJFUfQ<(9fsi{!i+!wD9~}7)A@Y91c+n-C<0v9J(i>2Jy5ZR;m$3NU-Tnq7kUph-8r3#Zf`JttkMjfQVHBRs|7|Hk!4C))rL>QtqpD7aX1m?qwOXw=&+~$IyM3@;uis7h+JrgL(_*oBWy#M30-F(P ztD_j>W(Wx+m53&j$s@IB$zfSB>%JFi_f=x56aJS7#HAJPBciKkdLBTaN+V&@L?G4@ zQUlSn-?&aiAcEB1r@Zl~C#}Pp&_`JlLSmED5>ha`yw~)&;`ZkWh;&I0ZCzsRlB%<7 zaz85(VggMN|B0{(;#!3Jh}A!ch;3ZbRTAH06TvUmgFXf`ql9$;0000 + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml new file mode 100644 index 0000000000..2a3207ce7b --- /dev/null +++ b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/drawable/module_widgets_app_handler_bkg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml new file mode 100644 index 0000000000..759cfa6b94 --- /dev/null +++ b/skin/mogo-skin-light/src/main/mogo-module-widgets-res/values/colors.xml @@ -0,0 +1,4 @@ + + + #333333 + \ No newline at end of file