Fix customization nav drawer items

This commit is contained in:
Chumva 2019-10-10 14:58:50 +03:00
parent 8d7971c9ec
commit e2356d05da
2 changed files with 10 additions and 8 deletions

View file

@ -1278,16 +1278,17 @@ public class OsmandAidlService extends Service implements AidlCallbackListener {
}; };
private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) { private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) {
OsmandSettingsParams settingsParams = params.getSettingsParams();
if (settingsParams != null) {
api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle());
}
NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams(); NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams();
NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams(); NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams();
SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams(); SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams();
setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams); setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams);
OsmandSettingsParams settingsParams = params.getSettingsParams();
if (settingsParams != null) {
api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle());
}
ArrayList<SetWidgetsParams> visibilityWidgetsParams = params.getVisibilityWidgetsParams(); ArrayList<SetWidgetsParams> visibilityWidgetsParams = params.getVisibilityWidgetsParams();
ArrayList<SetWidgetsParams> availabilityWidgetsParams = params.getAvailabilityWidgetsParams(); ArrayList<SetWidgetsParams> availabilityWidgetsParams = params.getAvailabilityWidgetsParams();

View file

@ -1228,16 +1228,17 @@ public class OsmandAidlServiceV2 extends Service implements AidlCallbackListener
}; };
private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) { private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) {
OsmandSettingsParams settingsParams = params.getSettingsParams();
if (settingsParams != null) {
api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle());
}
NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams(); NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams();
NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams(); NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams();
SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams(); SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams();
setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams); setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams);
OsmandSettingsParams settingsParams = params.getSettingsParams();
if (settingsParams != null) {
api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle());
}
ArrayList<SetWidgetsParams> visibilityWidgetsParams = params.getVisibilityWidgetsParams(); ArrayList<SetWidgetsParams> visibilityWidgetsParams = params.getVisibilityWidgetsParams();
ArrayList<SetWidgetsParams> availabilityWidgetsParams = params.getAvailabilityWidgetsParams(); ArrayList<SetWidgetsParams> availabilityWidgetsParams = params.getAvailabilityWidgetsParams();