feat(myapps): clean & optimize

src/app/modules.ts

@@ -33,8 +33,6 @@ export default () => {
       ...(IncludedModules || []),
 
       // Built-in modules that depends on other
-      // CAUTION ! Modules that depends on other (ex myAppMenu) must be listed at the end !
-      require('~/framework/modules/myAppMenu'),
     ];
     AllModules = loadModules(moduleDeclarations);
     return AllModules;

src/framework/modules/myAppMenu/components/manage-favorite-modal/component.tsx → src/framework/modules/myapps/components/manage-favorite-modal/component.tsx

@@ -12,8 +12,8 @@ import { NavBarAction, NavBarActionsGroup } from '~/framework/components/navigat
 import { PageView } from '~/framework/components/page';
 import SearchBar from '~/framework/components/search-bar';
 import { SearchBarHandle } from '~/framework/components/search-bar/types';
-import { MyAppsList } from '~/framework/modules/myAppMenu/components/my-apps-list';
-import { EMPTY_SCREEN_CONFIG } from '~/framework/modules/myAppMenu/screens/utils';
+import { MyAppsList } from '~/framework/modules/myapps/components/my-apps-list';
+import { EMPTY_SCREEN_CONFIG } from '~/framework/modules/myapps/screens/utils';
 import { navBarOptions } from '~/framework/navigation/navBar';
 
 const HeaderLeft = ({ isSaving, onClose }: HeaderLeftProps) => (

src/framework/modules/myAppMenu/components/my-apps-filters/component.tsx → src/framework/modules/myapps/components/my-apps-filters/component.tsx

@@ -15,7 +15,7 @@
 import SearchBar from '~/framework/components/search-bar';
 import { SearchBarHandle } from '~/framework/components/search-bar/types';
 import { SmallActionText } from '~/framework/components/text';
-import { MyAppsFilterCell } from '~/framework/modules/myAppMenu/components';
+import { MyAppsFilterCell } from '~/framework/modules/myapps/components';
 
 export const MyAppsFilters = ({ onFilterChange, selectedFilter }: MyAppsFiltersProps) => {
   const searchQuery = selectedFilter.type === 'search' ? selectedFilter.value : '';
@@ -27,11 +27,11 @@
   const searchRef = React.useRef<SearchBarHandle>(null);
 
   const { animatedContainerStyle, animatedIconStyle, animatedSearchStyle, close, open } = useAnimatedSearchStyles();
   const borderColor = !searchActive
     ? theme.palette.primary.regular
     : searchFocused
       ? theme.palette.primary.regular
       : theme.palette.grey.cloudy;
 
   const scrollToItem = React.useCallback((index: number) => {
     listRef.current?.scrollToIndex({

src/framework/modules/myAppMenu/components/my-apps-list/component.tsx → src/framework/modules/myapps/components/my-apps-list/component.tsx

@@ -10,7 +10,7 @@ import { buildAllAppsCategoryList, buildAppItem, isSeparator } from './utils';
 import { I18n } from '~/app/i18n';
 import { EmptyScreen } from '~/framework/components/empty-screens';
 import { SmallBoldText } from '~/framework/components/text';
-import { MyAppsCard } from '~/framework/modules/myAppMenu/components';
+import { MyAppsCard } from '~/framework/modules/myapps/components';
 
 const NUM_COLUMNS = 2;
 

src/framework/modules/myapps/index.ts

@@ -1,13 +1,9 @@
-import { Action } from 'redux';
-
 import './init';
 import config from './module-config';
+import getRoot from './navigation/navigator';
 import reducer from './reducer/reducer';
-import { AppsInfoState } from './types';
+import { storage } from './storage';
 
-import { Module } from '~/framework/util/moduleTool';
+import { NavigableModule } from '~/framework/util/moduleTool';
 
-module.exports = new Module<'myapps', typeof config, AppsInfoState, Action>({
-  config,
-  reducer,
-});
+module.exports = new NavigableModule({ config, getRoot, reducer, storage });

src/framework/modules/myapps/module-config.ts

@@ -1,13 +1,18 @@
 import type { AppsInfoState } from './types';
 
-import { ModuleConfig } from '~/framework/util/moduleTool';
+import { ModuleType, NavigableModuleConfig } from '~/framework/util/moduleTool';
 
-export default new ModuleConfig<'myapps', AppsInfoState>({
+export default new NavigableModuleConfig<'myapps', AppsInfoState>({
+  displayAs: ModuleType.TAB_MODULE,
+  displayI18n: 'myapp-appname',
+  displayOrder: 3,
+  displayPicture: { name: 'icon-apps-off', type: 'Icon' },
+  displayPictureFocus: { name: 'icon-apps-on', type: 'Icon' },
   entcoreScope: [],
   hasRight: () => true,
   matchEntcoreApp: 'myapps',
-
   matchEntcoreWidget: () => false,
   name: 'myapps',
   storageName: 'myapps',
+  testID: 'tabbar-apps',
 });

src/framework/modules/myAppMenu/myAppsModules.ts → src/framework/modules/myapps/myAppsModules.ts

@@ -1,5 +1,5 @@
 /**
- * A specific moduleMap that exists inside myAppMenu
+ * A specific moduleMap that exists inside myapps
  */
 import { ModuleRegister, setGlobalRegister, UnknownNavigableModule } from '~/framework/util/moduleTool';
 

src/framework/modules/myAppMenu/navigation/index.ts → src/framework/modules/myapps/navigation/index.ts

@@ -1,6 +1,6 @@
 import { ParamListBase } from '@react-navigation/native';
 
-import moduleConfig from '~/framework/modules/myAppMenu/module-config';
+import moduleConfig from '~/framework/modules/myapps/module-config';
 
 export const myAppsRouteNames = {
   Home: `${moduleConfig.routeName}` as 'Home',

src/framework/modules/myAppMenu/navigation/navigator.tsx → src/framework/modules/myapps/navigation/navigator.tsx

@@ -2,9 +2,9 @@
 
 import { IMyAppsNavigationParams, myAppsRouteNames } from '.';
 
-import moduleConfig from '~/framework/modules/myAppMenu/module-config';
-import { myAppsConnector, myAppsModules, myAppsSecondaryModules } from '~/framework/modules/myAppMenu/myAppsModules';
-import MyAppsHomeScreen, { computeNavBar as homeNavBar } from '~/framework/modules/myAppMenu/screens/MyAppsHomeScreen';
+import moduleConfig from '~/framework/modules/myapps/module-config';
+import { myAppsConnector, myAppsModules, myAppsSecondaryModules } from '~/framework/modules/myapps/myAppsModules';
+import MyAppsHomeScreen, { computeNavBar as homeNavBar } from '~/framework/modules/myapps/screens/myapps-home-screen';
 import { createModuleNavigator } from '~/framework/navigation/moduleScreens';
 import { AnyNavigableModule, NavigableModuleArray } from '~/framework/util/moduleTool';
 
@@ -16,8 +16,8 @@
     <MyAppsHomeScreen {...props} modules={modules} secondaryModules={secondaryModules} connectors={connectors} />
   );
   return createModuleNavigator<IMyAppsNavigationParams>(moduleConfig.name, Stack => (
     <>
       <Stack.Screen name={myAppsRouteNames.Home} component={MyAppsContainer} options={homeNavBar} initialParams={undefined} />
     </>
   ));
 }) as AnyNavigableModule['getRoot'];

src/framework/modules/myAppMenu/screens/MyAppsHomeScreen.tsx → src/framework/modules/myapps/screens/myapps-home-screen.tsx

@@ -17,13 +17,7 @@ import { NavBarAction, NavBarActionsGroup } from '~/framework/components/navigat
 import { PageView } from '~/framework/components/page';
 import { Svg } from '~/framework/components/picture';
 import { Toggle } from '~/framework/components/toggle';
-import {
-  MAOSProps,
-  MyAppsFilters,
-  MyAppsList,
-  MyAppsMenuItem,
-  MyAppsOnboardingModal,
-} from '~/framework/modules/myAppMenu/components';
+import { MAOSProps, MyAppsFilters, MyAppsList, MyAppsMenuItem, MyAppsOnboardingModal } from '~/framework/modules/myapps/components';
 import { AppsInfoAggregated } from '~/framework/modules/myapps/types';
 import { navBarOptions } from '~/framework/navigation/navBar';
 import Feedback from '~/framework/util/feedback/feedback';

src/framework/modules/myAppMenu/screens/types.ts → src/framework/modules/myapps/screens/types.ts

@@ -1,6 +1,6 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
 
-import { IMyAppsNavigationParams, myAppsRouteNames } from '~/framework/modules/myAppMenu/navigation';
+import { IMyAppsNavigationParams, myAppsRouteNames } from '~/framework/modules/myapps/navigation';
 import { NavigableModuleArray } from '~/framework/util/moduleTool';
 
 export interface MyAppsHomeScreenProps extends NativeStackScreenProps<IMyAppsNavigationParams, typeof myAppsRouteNames.Home> {

src/framework/modules/myAppMenu/screens/useController.ts → src/framework/modules/myapps/screens/useController.ts

@@ -11,7 +11,7 @@ import { I18n } from '~/app/i18n';
 import { AppDispatch, getStore } from '~/app/store';
 import { ModalBoxHandle } from '~/framework/components/ModalBox';
 import Toast from '~/framework/components/toast';
-import { MyAppsListItem } from '~/framework/modules/myAppMenu/components/my-apps-list/types';
+import { MyAppsListItem } from '~/framework/modules/myapps/components/my-apps-list/types';
 import {
   getAllappsShowedState,
   refreshMyApps,

src/framework/modules/myapps/storage.ts

@@ -11,8 +11,9 @@ export interface MyAppsOnboardingStorageData {
 }
 
 export interface MyAppsStorageData {
-  preferences?: MyAppsPreferencesStorageData;
-  onboarding?: MyAppsOnboardingStorageData;
+  'preferences'?: MyAppsPreferencesStorageData;
+  'onboarding'?: MyAppsOnboardingStorageData;
+  'infobubble-ack'?: boolean;
 }
 
 type MyAppsStorageMap = {
@@ -21,7 +22,16 @@ type MyAppsStorageMap = {
 
 const STORAGE_KEY: keyof MyAppsStorageMap = 'myapps';
 
-const myAppsStorage = Storage.preferences<MyAppsStorageMap>(moduleConfig, function () {});
+const oldStorageKey = 'infoBubbleAck-myAppsScreen.redirect';
+
+const myAppsStorage = Storage.preferences<MyAppsStorageMap>(moduleConfig, function () {
+  const oldValue = Storage.global.getString(oldStorageKey) as 'true' | 'false' | undefined;
+  if (oldValue === 'true') {
+    const data = this.getJSON(STORAGE_KEY) ?? {};
+    this.setJSON(STORAGE_KEY, { ...data, 'infobubble-ack': true });
+  }
+  Storage.global.delete(oldStorageKey);
+});
 
 export const readMyAppsPreferences = (): MyAppsPreferencesStorageData => {
   const data = myAppsStorage.getJSON(STORAGE_KEY);
@@ -60,3 +70,5 @@ export const writeMyAppsOnboardingSeen = (version: string) => {
 export const resetMyAppsStorage = () => {
   myAppsStorage.delete(STORAGE_KEY);
 };
+
+export const storage = myAppsStorage;

src/framework/modules/news/components/thumbnail-thread/component.tsx

@@ -16,6 +16,7 @@ import { Image } from '~/framework/util/media-deprecated';
 const Selected = () => (
   <View style={[styles.thumbnailSelectedItem, { borderColor: (moduleConfig.displayPicture as SvgProps).fill }]} />
 );
+const rawNewsIconName = 'actualites-large';
 
 export default function ThumbnailThread({ status = ThreadItemStatus.DEFAULT, ...props }: ThumbnailThreadProps) {
   const { icon, square } = props;
@@ -51,20 +52,20 @@ export default function ThumbnailThread({ status = ThreadItemStatus.DEFAULT, ...
     return (
       <View style={[globalStyle, styles.thumbnailContainerSelected]}>
         <Selected />
-        <Svg name="newsFeed" fill={(moduleConfig.displayPicture as SvgProps).fill} height={heightSVGNoIcon} />
+        <Svg name={rawNewsIconName} fill={(moduleConfig.displayPicture as SvgProps).fill} height={heightSVGNoIcon} />
       </View>
     );
   }
   if (status === ThreadItemStatus.DISABLED) {
     return (
       <View style={[globalStyle, styles.thumbnailNoIconDisabled]}>
-        <Svg name="newsFeed" fill={theme.palette.grey.graphite} height={heightSVGNoIcon} />
+        <Svg name={rawNewsIconName} fill={theme.palette.grey.graphite} height={heightSVGNoIcon} />
       </View>
     );
   }
   return (
     <View style={globalStyle}>
-      <Svg name="newsFeed" fill={(moduleConfig.displayPicture as SvgProps).fill} height={heightSVGNoIcon} />
+      <Svg name={rawNewsIconName} fill={(moduleConfig.displayPicture as SvgProps).fill} height={heightSVGNoIcon} />
     </View>
   );
 }

src/framework/modules/news/components/thumbnail-thread/styles.ts

@@ -12,6 +12,7 @@ export default StyleSheet.create({
     position: 'relative',
   },
   thumbnailItem: {
+    alignItems: 'center',
     justifyContent: 'center',
   },
   thumbnailItemRectangle: {

src/framework/navigation/modals/navigator.tsx

@@ -18,7 +18,7 @@ import AttachmentsImportScreen, {
 import {
   computeNavBar as ManageFavoritesAddNavbar,
   ManageFavoritesModalScreen,
-} from '~/framework/modules/myAppMenu/components/manage-favorite-modal';
+} from '~/framework/modules/myapps/components/manage-favorite-modal';
 import SplashadsScreen, { computeNavBar as SplashadsNavBar } from '~/framework/modules/splashads/screen';
 import { setCrossIconBlackForRoutes, setModalModeForRoutes } from '~/framework/navigation/hideTabBarAndroid';
 import { getTypedRootStack } from '~/framework/navigation/navigators';