8000 Extract ndk-expo to use ndk-mobile by pablof7z · Pull Request #6 · pablof7z/olas · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Extract ndk-expo to use ndk-mobile #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Extract ndk-expo to use ndk-mobile #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0394c3
extract to ndk-mobile
pablof7z Nov 20, 2024
0b7bcf0
multi-image support
pablof7z Nov 21, 2024
80a5acb
update ndk version
pablof7z Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions apps/mobile/app/(tabs)/(home)/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { useSubscribe } from '@/ndk-expo';
import { NDKEvent, NDKFilter, NDKKind } from '@nostr-dev-kit/ndk';
import { useSubscribe, useNDKSession } from '@nostr-dev-kit/ndk-mobile';
import { NDKEvent, NDKFilter, NDKKind } from '@nostr-dev-kit/ndk-mobile';
import { useMemo, useState } from 'react';
import { Dimensions, Pressable, StyleSheet, View } from 'react-native';
import { FlashList } from '@shopify/flash-list';
import Post from '@/components/events/Post';
import { useNDKSession } from '@/ndk-expo/hooks/session';
import { useThrottle } from '@uidotdev/usehooks';
import { RefreshControl } from 'react-native-gesture-handler';
import { UserProfileProvider } from '@/ndk-expo/components/user/profile';
import { myFollows } from '@/utils/myfollows';
import { Stack } from 'expo-router';
import { Filter } from 'lucide-react-native';
Expand All @@ -16,7 +14,7 @@ import { DropdownMenu } from '~/components/nativewindui/DropdownMenu';
import { createDropdownItem } from '~/components/nativewindui/DropdownMenu/utils';
import { useColorScheme } from '@/lib/useColorScheme';
import { useScroll } from '~/contexts/ScrollContext';

import * as User from '@/components/ui/user';
const FilterButton = memo(({ includeTweets, setIncludeTweets }: { includeTweets: boolean; setIncludeTweets: (value: boolean) => void }) => {
const { colors } = useColorScheme();

Expand Down Expand Up @@ -122,9 +120,9 @@ export default function HomeScreen() {
keyExtractor={(item) => item.id}
refreshControl={<RefreshControl refreshing={refreshing} />}
renderItem={({ item }) => (
<UserProfileProvider pubkey={item.pubkey}>
<User.Profile pubkey={item.pubkey}>
<Post event={item} />
</UserProfileProvider>
</User.Profile>
)}
contentContainerStyle={styles.listContainer}
/>
Expand Down
5 changes: 2 additions & 3 deletions apps/mobile/app/(tabs)/(settings)/blossom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { useNDK } from '@/ndk-expo';
import { useNDK, useNDKSession } from '@nostr-dev-kit/ndk-mobile';
import { useMemo, useState } from 'react';

import { LargeTitleHeader } from '~/components/nativewindui/LargeTitleHeader';
import { ESTIMATED_ITEM_HEIGHT, List, ListDataItem, ListItem, ListRenderItemInfo, ListSectionHeader } from '~/components/nativewindui/List';
import { Text } from '~/components/nativewindui/Text';
import { cn } from '~/lib/cn';
import { NDKKind, NDKList, NostrEvent } from '@nostr-dev-kit/ndk';
import { NDKKind, NDKList, NostrEvent } from '@nostr-dev-kit/ndk-mobile';
import { TextInput, TouchableOpacity } from 'react-native-gesture-handler';
import { router } from 'expo-router';
import { useNDKSession } from '@/ndk-expo/hooks/session';

export default function BlossomScreen() {
const { ndk } = useNDK();
Expand Down
5 changes: 2 additions & 3 deletions apps/mobile/app/(tabs)/(settings)/index.tsx
View file
Open in desktop
F438
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNDK } from '@/ndk-expo';
import { useNDK, useNDKWallet } from '@nostr-dev-kit/ndk-mobile';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useEffect, useMemo, useState } from 'react';
import { View } from 'react-native';
Expand All @@ -10,8 +10,7 @@ import { cn } from '~/lib/cn';
import { useColorScheme } from '~/lib/useColorScheme';
import { router } from 'expo-router';
import { ThemeToggle } from '@/components/ThemeToggle';
import * as User from '@/ndk-expo/components/user';
import { useNDKWallet } from '@/ndk-expo/providers/wallet';
import * as User from '@/components/ui/user';
import { walleteStore } from '@/app/stores';
import { useStore } from 'zustand';
import { NDKWalletBalance } from '@nostr-dev-kit/ndk-wallet';
Expand Down
6 changes: 2 additions & 4 deletions apps/mobile/app/(tabs)/(settings)/key.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { useNDK } from '@/ndk-expo';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useMemo } from 'react';
import { View } from 'react-native';
import * as User from '@/ndk-expo/components/user';
import * as User from '@/components/ui/user';

import { Avatar, AvatarFallback, AvatarImage } from '~/components/nativewindui/Avatar';
import { LargeTitleHeader } from '~/components/nativewindui/LargeTitleHeader';
import { ESTIMATED_ITEM_HEIGHT, List, ListDataItem, ListItem, ListRenderItemInfo, ListSectionHeader } from '~/components/nativewindui/List';
import { Text } from '~/components/nativewindui/Text';
import { cn } from '~/lib/cn';
import { useColorScheme } from '~/lib/useColorScheme';
import { NDKPrivateKeySigner, NDKUser } from '@nostr-dev-kit/ndk';
import { NDKPrivateKeySigner, useNDK } from '@nostr-dev-kit/ndk-mobile';
import { nip19 } from 'nostr-tools';

export default function SettingsIosStyleScreen() {
Expand Down
12 changes: 5 additions & 7 deletions apps/mobile/app/(tabs)/(settings)/relays.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { useNDK } from '@/ndk-expo';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useNDK } from '@nostr-dev-kit/ndk-mobile';
import { Icon } from '@roninoss/icons';
import { useMemo, useState } from 'react';
import { View } from 'react-native';
import * as User from '@/ndk-expo/components/user';

import { Avatar, AvatarFallback, AvatarImage } from '~/components/nativewindui/Avatar';
import { LargeTitleHeader } from '~/components/nativewindui/LargeTitleHeader';
import { ESTIMATED_ITEM_HEIGHT, List, ListDataItem, ListItem, ListRenderItemInfo, ListSectionHeader } from '~/components/nativewindui/List';
import { Text } from '~/components/nativewindui/Text';
import { cn } from '~/lib/cn';
import { useColorScheme } from '~/lib/useColorScheme';
import { NDKPrivateKeySigner, NDKRelay, NDKRelayStatus, NDKUser } from '@nostr-dev-kit/ndk';
import { NDKRelay, NDKRelayStatus } from '@nostr-dev-kit/ndk-mobile';
import * as SecureStore from 'expo-secure-store';
import { TextInput, TouchableOpacity } from 'react-native-gesture-handler';
import { router } from 'expo-router';
Expand All @@ -37,7 +34,8 @@ function RelayConnectivityIndicator({ relay }: { relay: NDKRelay }) {
width: 8,
height: 8,
backgroundColor: color,
}}></View>
}}
/>
);
}

Expand Down
6 changes: 2 additions & 4 deletions apps/mobile/app/(tabs)/(settings)/wallet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNDK } from '@/ndk-expo';
import { useNDK, useNDKWallet } from '@nostr-dev-kit/ndk-mobile';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useMemo } from 'react';
import { View } from 'react-native';
Expand All @@ -10,13 +10,11 @@ import { cn } from '~/lib/cn';
import { useColorScheme } from '~/lib/useColorScheme';
import { router } from 'expo-router';
import { ThemeToggle } from '@/components/ThemeToggle';
import * as User from '@/ndk-expo/components/user';
import { useNDKWallet } from '@/ndk-expo/providers/wallet';
import * as User from '@/components/ui/user';
import { walleteStore } from '@/app/stores';
import { useStore } from 'zustand';
import { NDKCashuWallet } from '@nostr-dev-kit/ndk-wallet';
export default function SettingsIosStyleScreen() {
const { currentUser, logout } = useNDK();
const { walletService } = useNDKWallet();
const { activeWallet, setActiveWallet } = useStore(walleteStore);

Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/app/(tabs)/(settings)/wallet/mints.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useNDK, useSubscribe } from '@/ndk-expo';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { Dimensions, View } from 'react-native';
Expand All @@ -13,8 +12,9 @@ import { useStore } from 'zustand';
import { TextInput, TouchableOpacity } from 'react-native-gesture-handler';
import { router } from 'expo-router';
import { CashuMint, GetInfoResponse } from '@cashu/cashu-ts';
import { useNDKWallet } from '@/ndk-expo/providers/wallet';
import { NDKCashuWallet } from '@nostr-dev-kit/ndk-wallet';
import { useNDK, useNDKWallet } from '@nostr-dev-kit/ndk-mobile';
import { useSubscribe } from '@nostr-dev-kit/ndk-mobile';

export default function RelaysScreen() {
const { ndk } = useNDK();
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/app/(tabs)/(settings)/wallet/relays.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNDK } from '@/ndk-expo';
import { useNDK } from '@nostr-dev-kit/ndk-mobile';
import { Icon, MaterialIconName } from '@roninoss/icons';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { View } from 'react-native';
Expand All @@ -19,7 +19,7 @@ import NDK, {
NDKSubscriptionCacheUsage,
NDKUser,
NostrEvent,
} from '@nostr-dev-kit/ndk';
} from '@nostr-dev-kit/ndk-mobile';
import { walleteStore } from '@/app/stores';
import { useStore } from 'zustand';
import { TextInput, TouchableOpacity } from 'react-native-gesture-handler';
Expand Down
22 changes: 4 additions & 18 deletions apps/mobile/app/(tabs)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
import { Link, router, Tabs } from 'expo-router';
import { router, Tabs } from 'expo-router';
import { useColorScheme } from '@/lib/useColorScheme';
import { Icon } from '@roninoss/icons';
import {
BoltIcon,
Home,
Mic,
PlaySquare,
PlusSquare,
Search,
Speaker,
SpeakerIcon,
SquarePlay,
UserCircle2,
Wallet,
Wallet2,
} from 'lucide-react-native';
import * as User from '@/ndk-expo/components/user';
import { useNDK } from '@/ndk-expo';
import { Home, PlaySquare, PlusSquare, UserCircle2 } from 'lucide-react-native';
import * as User from '@/components/ui/user';
import { useNDK } from '@nostr-dev-kit/ndk-mobile';
import { useScrollToTop } from '@react-navigation/native';
import { useScroll } from '~/contexts/ScrollContext';

Expand Down
8 changes: 4 additions & 4 deletions apps/mobile/app/(tabs)/reels.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useSubscribe } from '@/ndk-expo';
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
import { useSubscribe, useNDK } from '@nostr-dev-kit/ndk-mobile';
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk-mobile';
import { FlashList } from '@shopify/flash-list';
import { useMemo, useRef, useState } from 'react';
import { ActivityIndicator, Dimensions, Pressable, View, ViewToken } from 'react-native';
import { Text } from '@/components/nativewindui/Text';
import { ResizeMode, Video } from 'expo-av';
import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
import * as User from '@/ndk-expo/components/user';
import * as User from '@/components/ui/user';
import { router } from 'expo-router';
import EventContent from '@/ndk-expo/components/event/content';
import EventContent from '@/components/ui/event/content';
import { Image } from 'expo-image';
import { memo } from 'react';

Expand Down
33 changes: 7 additions & 26 deletions apps/mobile/app/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,22 @@ import 'react-native-get-random-values';
import { PortalHost } from '@rn-primitives/portal';
import * as SecureStore from 'expo-secure-store';
import { ThemeProvider as NavThemeProvider } from '@react-navigation/native';
import { NDKCacheAdapterSqlite, useNDK } from '@/ndk-expo';
import { NDKCacheAdapterSqlite, useNDK } from '@nostr-dev-kit/ndk-mobile';
import { Link, router, Stack, Tabs, useNavigation } from 'expo-router';
import * as SplashScreen from 'expo-splash-screen';
import { StatusBar } from 'expo-status-bar';
import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { KeyboardProvider } from 'react-native-keyboard-controller';
import { View } from 'react-native';
import { Button } from '@/components/nativewindui/Button';
import { NDKWalletProvider } from '@/ndk-expo/providers/wallet';

import { useColorScheme, useInitialAndroidBarSync } from '~/lib/useColorScheme';
import { NAV_THEME } from '~/theme';
import { NDKProvider } from '~/ndk-expo';
import { NDKProvider } from '@nostr-dev-kit/ndk-mobile';
import { Text } from '@/components/nativewindui/Text';
import { Icon } from '@roninoss/icons';
import { NDKEvent, NDKKind, NDKList, NDKPrivateKeySigner, NDKRelay, NDKRelaySet, NostrEvent } from '@nostr-dev-kit/ndk';
import NDKSessionProvider from '@/ndk-expo/providers/session';
import { NDKKind, NDKList, NDKRelay } from '@nostr-dev-kit/ndk-mobile';
import { NDKWalletProvider, NDKSessionProvider } from '@nostr-dev-kit/ndk-mobile';
import { ActivityIndicator } from '@/components/nativewindui/ActivityIndicator';
import { ScrollProvider } from '~/contexts/ScrollContext';

Expand Down Expand Up @@ -107,28 +106,10 @@ export default function RootLayout() {
<NavThemeProvider value={NAV_THEME[colorScheme]}>
<PortalHost />
<Stack>
<Stack.Screen
name="login"
options={{
headerShown: false,
presentation: 'modal',
}}
/>
<Stack.Screen name="login" options={{ headerShown: false, presentation: 'modal', }} />

<Stack.Screen
name="publish/index"
options={{
headerShown: true,
presentation: 'modal',
}}
/>
<Stack.Screen
name="publish/caption"
options={{
headerShown: true,
presentation: 'modal',
}}
/>
<Stack.Screen name="publish/index" options={{ headerShown: true, presentation: 'modal', }} />
<Stack.Screen name="publish/caption" options={{ headerShown: true, presentation: 'modal', }} />
<Stack.Screen name="publish/expiration" options={{ headerShown: true, presentation: 'modal' }} />
<Stack.Screen name="publish/type" options={{ headerShown: true, presentation: 'modal' }} />

Expand Down
6 changes: 3 additions & 3 deletions apps/mobile/app/comment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { KeyboardAvoidingView, KeyboardAwareScrollView } from 'react-native-keyb
import { router, Stack } from 'expo-router';
import { useCallback, useMemo, useState } from 'react';
import { View } from 'react-native';
import { useNDK, useSubscribe } from '@/ndk-expo';
import * as User from '@/ndk-expo/components/user';
import { useNDK } from '@nostr-dev-kit/ndk-mobile';
import * as User from '@/components/ui/user';
import { Text } from '@/components/nativewindui/Text';
import { Button } from '@/components/nativewindui/Button';
import { NDKEvent, NDKKind, NostrEvent } from '@nostr-dev-kit/ndk';
import { NDKEvent, NDKKind, NostrEvent } from '@nostr-dev-kit/ndk-mobile';
import { activeEventStore } from './stores';
import { useStore } from 'zustand';

Expand Down
14 changes: 4 additions & 10 deletions apps/mobile/app/comments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
import { TextInput } from 'react-native-gesture-handler';
import { KeyboardAvoidingView, Platform } from 'react-native';
import { router, Stack } from 'expo-router';
import { useCallback, useMemo, useState } from 'react';
import { Dimensions, View } from 'react-native';
import { useNDK, useSubscribe } from '@/ndk-expo';
import * as User from '@/ndk-expo/components/user';
import { Text } from '@/components/nativewindui/Text';
import { Button } from '@/components/nativewindui/Button';
import { NDKEvent, NDKKind, NostrEvent } from '@nostr-dev-kit/ndk';
import { useNDK, useSubscribe } from '@nostr-dev-kit/ndk-mobile';
import * as User from '@/components/ui/user';
import { NDKEvent, NDKKind, NostrEvent } from '@nostr-dev-kit/ndk-mobile';
import { activeEventStore } from './stores';
import { useStore } from 'zustand';
import { FlashList } from '@shopify/flash-list';
import { LargeTitleHeader } from '@/components/nativewindui/LargeTitleHeader';
import EventContent from '@/ndk-expo/components/event/content';
import EventContent from '@/components/ui/event/content';
import RelativeTime from './components/relative-time';
import { SafeAreaView } from 'react-native-safe-area-context';

Expand Down
10 changes: 7 additions & 3 deletions apps/mobile/app/login.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
console.log('global crypto');
import 'react-native-get-random-values';
console.log(!!global.crypto.getRandomValues);
import React, { useEffect, useState } from 'react';
import { StyleSheet, TextInput, TouchableOpacity, Alert, KeyboardAvoidingView, Platform, View } from 'react-native';
import { useNDK } from '@/ndk-expo';
import { Stack, useRouter } from 'expo-router';
import { NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
import { useNDK } from '@nostr-dev-kit/ndk-mobile';
import { useRouter } from 'expo-router';
import { NDKPrivateKeySigner } from '@nostr-dev-kit/ndk-mobile';
import { nip19 } from 'nostr-tools';
import { Text } from '@/components/nativewindui/Text';
import { Button } from '@/components/nativewindui/Button';
import * as Crypto from 'expo-crypto';

export default function LoginScreen() {
const [payload, setPayload] = useState<string | undefined>(undefined);
Expand Down
8 changes: 4 additions & 4 deletions apps/mobile/app/profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { View, Text, StyleSheet, TouchableOpacity, Dimensions, Animated } from 'react-native';
import Image from '@/components/media/image';
import * as User from '@/ndk-expo/components/user';
import * as User from '@/components/ui/user';
import { router, useLocalSearchParams } from 'expo-router';
import { useMemo, useState, useRef } from 'react';
import { useStore } from 'zustand';
import { NDKEvent, NDKFilter, NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
import { NDKKind } from '@nostr-dev-kit/ndk';
import { useSubscribe } from '@/ndk-expo';
import { NDKEvent, NDKFilter, NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk-mobile';
import { NDKKind } from '@nostr-dev-kit/ndk-mobile';
import { useSubscribe, useNDK } from '@nostr-dev-kit/ndk-mobile';
import { MasonryFlashList } from '@shopify/flash-list';
import { activeEventStore } from './stores';

Expand Down
Loading
Loading
0