From a1143f3696a0b272018f7eea43ee23a674c618e1 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sat, 28 Sep 2024 13:46:22 +0530 Subject: Add context menu for apps (fav,settings,uninstall) --- App.tsx | 29 ++---------- android/app/src/main/AndroidManifest.xml | 2 + bun.lockb | Bin 398223 -> 398665 bytes package.json | 1 + src/View.tsx | 29 ++++++++++++ src/components/AppMenu.tsx | 79 +++++++++++++++++++++++++++++++ src/components/Clock.tsx | 4 +- src/components/Favorites.tsx | 49 +++++++++++-------- src/hooks/useFavorites.ts | 14 +++++- src/screens/AppList.tsx | 22 ++++----- src/screens/Home.tsx | 7 ++- 11 files changed, 173 insertions(+), 63 deletions(-) create mode 100644 src/View.tsx create mode 100644 src/components/AppMenu.tsx diff --git a/App.tsx b/App.tsx index 2294656..1852a04 100644 --- a/App.tsx +++ b/App.tsx @@ -1,34 +1,13 @@ -import React, {useState} from 'react'; +import React from 'react'; import {SafeAreaView} from 'react-native'; -import {InstalledApps} from 'react-native-launcher-kit'; -import Swiper from 'react-native-swiper'; -import {AppList} from './src/screens/AppList'; -import {Home} from './src/screens/Home'; import {GestureHandlerRootView} from 'react-native-gesture-handler'; +import {View} from './src/View'; const App: React.FC = () => { - const [apps, _setApps] = useState(() => InstalledApps.getSortedApps()); - const [screenIndex, setScreenIndex] = useState(0); - - // const refreshApps = () => setApps(InstalledApps.getSortedApps()); - - // useEffect(() => { - // refreshApps(); - // }, [screenIndex]); - return ( - - } - activeDot={<>} - onIndexChanged={setScreenIndex}> - - - + + ); diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4122f36..2a2071e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + + { + const [apps, _setApps] = useState(() => InstalledApps.getSortedApps()); + const [screenIndex, setScreenIndex] = useState(0); + + // const refreshApps = () => setApps(InstalledApps.getSortedApps()); + + // useEffect(() => { + // refreshApps(); + // }, [screenIndex]); + + return ( + } + activeDot={<>} + onIndexChanged={setScreenIndex}> + + + + ); +}; diff --git a/src/components/AppMenu.tsx b/src/components/AppMenu.tsx new file mode 100644 index 0000000..ec0d684 --- /dev/null +++ b/src/components/AppMenu.tsx @@ -0,0 +1,79 @@ +import {Text, View, Modal, TouchableOpacity, Pressable} from 'react-native'; +import {AppDetail} from 'react-native-launcher-kit/typescript/Interfaces/InstalledApps'; +import {useFavorites} from '../hooks/useFavorites'; +import React, {useState} from 'react'; +import IntentLauncher from '@angelkrak/react-native-intent-launcher'; + +export const AppMenu: React.FC> = ({ + app, + children, +}) => { + const [isOpen, setIsOpen] = useState(false); + const {addToFavorites, isFavorite, removeFromFavorites} = useFavorites(); + + const menuPress = (fn: () => Promise | void) => async () => { + await fn(); + setIsOpen(false); + }; + + const menuItems = [ + isFavorite(app.packageName) + ? { + label: 'Remove from favorites', + onPress: menuPress(() => removeFromFavorites(app.packageName)), + } + : { + label: 'Add to favorites', + onPress: menuPress(() => addToFavorites(app.packageName)), + }, + { + label: 'App info', + onPress: menuPress(() => + IntentLauncher.startActivity({ + action: 'android.settings.APPLICATION_DETAILS_SETTINGS', + data: 'package:' + app.packageName, + }), + ), + }, + { + label: 'Uninstall', + onPress: menuPress(() => + IntentLauncher.startActivity({ + action: 'android.intent.action.DELETE', + data: 'package:' + app.packageName, + }), + ), + }, + ]; + + return ( + <> + setIsOpen(true)}> + {children} + + + setIsOpen(false)}> + setIsOpen(false)}> + + + {menuItems.map((menuItem) => ( + + + {menuItem.label} + + + ))} + + + + + + ); +}; diff --git a/src/components/Clock.tsx b/src/components/Clock.tsx index 113201f..619a31b 100644 --- a/src/components/Clock.tsx +++ b/src/components/Clock.tsx @@ -14,7 +14,7 @@ export const Clock: React.FC = () => { const formatter = new Intl.DateTimeFormat('en', { hour: 'numeric', minute: 'numeric', - second: 'numeric', + // second: 'numeric', }); return formatter.format(date); }, [date]); @@ -30,7 +30,7 @@ export const Clock: React.FC = () => { return ( - {timeText} + {timeText} {dateText} ); diff --git a/src/components/Favorites.tsx b/src/components/Favorites.tsx index 85ab3c2..c2adae7 100644 --- a/src/components/Favorites.tsx +++ b/src/components/Favorites.tsx @@ -1,4 +1,4 @@ -import React, {useCallback, useMemo} from 'react'; +import React, {useCallback, useEffect, useMemo} from 'react'; import {Text, TouchableOpacity, View} from 'react-native'; import {AppDetail} from 'react-native-launcher-kit/typescript/Interfaces/InstalledApps'; import {useFavorites} from '../hooks/useFavorites'; @@ -8,9 +8,13 @@ import DraggableFlatList, { ShadowDecorator, } from 'react-native-draggable-flatlist'; import Icon from 'react-native-vector-icons/MaterialIcons'; +import {AppMenu} from './AppMenu'; -export const Favorites: React.FC<{apps: AppDetail[]}> = ({apps}) => { - const {favoriteAppNames, setFavorites} = useFavorites(); +export const Favorites: React.FC<{apps: AppDetail[]; active: boolean}> = ({ + apps, + active, +}) => { + const {favoriteAppNames, setFavorites, refreshFavorites} = useFavorites(); const appByName = useMemo( () => Object.fromEntries(apps.map((app) => [app.packageName, app])), @@ -29,8 +33,13 @@ export const Favorites: React.FC<{apps: AppDetail[]}> = ({apps}) => { [setFavorites], ); + useEffect(() => { + if (!active) return; + refreshFavorites(); + }, [active, refreshFavorites]); + return ( - + = ({apps}) => { renderItem={({item: app, drag, isActive}) => ( - - {app.label} - - - - - - + + + {app.label} + + + + + + + )} - renderPlaceholder={() => } + renderPlaceholder={() => } /> ); diff --git a/src/hooks/useFavorites.ts b/src/hooks/useFavorites.ts index 619817c..46b6e77 100644 --- a/src/hooks/useFavorites.ts +++ b/src/hooks/useFavorites.ts @@ -24,24 +24,34 @@ export const useFavorites = () => { const setFavorites = useStableCallback(async (names: string[]) => { const newNames = [...new Set(names)]; - setFavoriteAppNames(newNames); await favoritesStorage.setItem(JSON.stringify(newNames)); + refreshFavorites(); }); const addToFavorites = useStableCallback(async (packageName: string) => { const names = await getFavoriteAppNames(); setFavorites([...names, packageName]); }); + const removeFromFavorites = useStableCallback(async (packageName: string) => { + const names = await getFavoriteAppNames(); + setFavorites(names.filter((name) => name !== packageName)); + }); + + const isFavorite = useStableCallback((packageName: string) => + favoriteAppNames.includes(packageName), + ); useEffect(() => { refreshFavorites(); }, [refreshFavorites]); return { + addToFavorites, favoriteAppNames, getFavoriteAppNames, - addToFavorites, + isFavorite, refreshFavorites, + removeFromFavorites, setFavorites, }; }; diff --git a/src/screens/AppList.tsx b/src/screens/AppList.tsx index 81c8f4f..e6b3e6e 100644 --- a/src/screens/AppList.tsx +++ b/src/screens/AppList.tsx @@ -2,16 +2,13 @@ import {matchSorter} from 'match-sorter'; import React, {useEffect, useMemo, useRef, useState} from 'react'; import {ScrollView, Text, TextInput, View} from 'react-native'; import {AppDetail} from 'react-native-launcher-kit/typescript/Interfaces/InstalledApps'; -import {useFavorites} from '../hooks/useFavorites'; -import {TouchableOpacity} from 'react-native-gesture-handler'; import Icon from 'react-native-vector-icons/MaterialIcons'; +import {AppMenu} from '../components/AppMenu'; -export const AppList: React.FC<{apps: AppDetail[]; isActive: boolean}> = ({ +export const AppList: React.FC<{apps: AppDetail[]; active: boolean}> = ({ apps, - isActive, + active, }) => { - const {addToFavorites} = useFavorites(); - const textInputRef = useRef(null); const [searchText, setSearchText] = useState(''); @@ -24,8 +21,8 @@ export const AppList: React.FC<{apps: AppDetail[]; isActive: boolean}> = ({ // Autofocus useEffect(() => { if (!textInputRef.current) return; - if (isActive) TextInput.State.focusTextInput(textInputRef.current); - }, [isActive]); + if (active) TextInput.State.focusTextInput(textInputRef.current); + }, [active]); return ( @@ -44,15 +41,14 @@ export const AppList: React.FC<{apps: AppDetail[]; isActive: boolean}> = ({ {filteredApps.map((app, index) => ( - - addToFavorites(app.packageName)}> + + {app.label} {app.packageName} - - + + ))} diff --git a/src/screens/Home.tsx b/src/screens/Home.tsx index 00a4b1f..7bd1a3f 100644 --- a/src/screens/Home.tsx +++ b/src/screens/Home.tsx @@ -4,11 +4,14 @@ import {Clock} from '../components/Clock'; import {AppDetail} from 'react-native-launcher-kit/typescript/Interfaces/InstalledApps'; import {Favorites} from '../components/Favorites'; -export const Home: React.FC<{apps: AppDetail[]}> = ({apps}) => { +export const Home: React.FC<{apps: AppDetail[]; active: boolean}> = ({ + apps, + active, +}) => { return ( - + ); }; -- cgit v1.3.1