Merge branch 'develop' into @christian/performance-fixes

rainbow-me · Jan 10, 2025 · 5249094 · 5249094
2 parents 8c19379 + 2d41255
commit 5249094
Show file tree

Hide file tree

Showing 58 changed files with 3,130 additions and 1,617 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.BLUETOOTH"/>
@@ -260,7 +261,7 @@
           </intent-filter>
       </activity-alias>
       <activity-alias
-          android:name="me.rainbow.MainActivityRedacted"
+          android:name="me.rainbow.MainActivityredacted"
           android:enabled="false"
           android:icon="@mipmap/redacted"
           android:roundIcon="@mipmap/redacted_round"

diff --git a/src/assets/CreateNewWalletGroup.png b/src/assets/CreateNewWalletGroup.png
diff --git a/src/components/DropdownMenu.tsx b/src/components/DropdownMenu.tsx
@@ -11,6 +11,12 @@ export const DropdownMenuRoot = DropdownMenuPrimitive.Root;
 export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
 export const DropdownMenuContent = DropdownMenuPrimitive.Content;
 export const DropdownMenuItem = DropdownMenuPrimitive.create(
+  styled(DropdownMenuPrimitive.Item)({
+    height: 34,
+  }),
+  'Item'
+);
+export const DropdownMenuCheckboxItem = DropdownMenuPrimitive.create(
   styled(DropdownMenuPrimitive.CheckboxItem)({
     height: 34,
   }),
@@ -35,6 +41,7 @@ export type MenuItemIcon = Omit<IconConfig, 'iconValue' | 'iconType'> & (MenuIte
 export type MenuItem<T> = Omit<MenuActionConfig, 'icon'> & {
   actionKey: T;
   actionTitle: string;
+  destructive?: boolean;
   icon?: MenuItemIcon | { iconType: string; iconValue: string };
 };
 
@@ -43,10 +50,12 @@ export type MenuConfig<T extends string> = Omit<_MenuConfig, 'menuItems' | 'menu
   menuItems: Array<MenuItem<T>>;
 };
 
-type DropDownMenuProps<T extends string> = {
+type DropdownMenuProps<T extends string> = {
   children: React.ReactElement;
   menuConfig: MenuConfig<T>;
   onPressMenuItem: (actionKey: T) => void;
+  triggerAction?: 'press' | 'longPress';
+  menuItemType?: 'checkbox';
 } & DropdownMenuContentProps;
 
 const buildIconConfig = (icon?: MenuItemIcon) => {
@@ -75,17 +84,21 @@ export function DropdownMenu<T extends string>({
   side = 'right',
   alignOffset = 5,
   avoidCollisions = true,
-}: DropDownMenuProps<T>) {
+  triggerAction = 'press',
+  menuItemType,
+}: DropdownMenuProps<T>) {
   const handleSelectItem = useCallback(
     (actionKey: T) => {
       onPressMenuItem(actionKey);
     },
     [onPressMenuItem]
   );
 
+  const MenuItemComponent = menuItemType === 'checkbox' ? DropdownMenuCheckboxItem : DropdownMenuItem;
+
   return (
     <DropdownMenuRoot>
-      <DropdownMenuTrigger>{children}</DropdownMenuTrigger>
+      <DropdownMenuTrigger action={triggerAction}>{children}</DropdownMenuTrigger>
       <DropdownMenuContent
         loop={loop}
         side={side}
@@ -97,19 +110,24 @@ export function DropdownMenu<T extends string>({
       >
         {!!menuConfig.menuTitle?.trim() && (
           <DropdownMenuPrimitive.Group>
-            <DropdownMenuItem disabled>
+            <MenuItemComponent disabled>
               <DropdownMenuItemTitle>{menuConfig.menuTitle}</DropdownMenuItemTitle>
-            </DropdownMenuItem>
+            </MenuItemComponent>
           </DropdownMenuPrimitive.Group>
         )}
         {menuConfig.menuItems?.map(item => {
           const Icon = buildIconConfig(item.icon as MenuItemIcon);
 
           return (
-            <DropdownMenuItem value={item.menuState ?? 'off'} key={item.actionKey} onSelect={() => handleSelectItem(item.actionKey)}>
+            <MenuItemComponent
+              value={item.menuState ?? 'off'}
+              destructive={item.destructive}
+              key={item.actionKey}
+              onSelect={() => handleSelectItem(item.actionKey)}
+            >
               <DropdownMenuItemTitle>{item.actionTitle}</DropdownMenuItemTitle>
               {Icon}
-            </DropdownMenuItem>
+            </MenuItemComponent>
           );
         })}
       </DropdownMenuContent>

diff --git a/src/components/SmoothPager/ListPanel.tsx b/src/components/SmoothPager/ListPanel.tsx
@@ -38,7 +38,7 @@ export const TapToDismiss = memo(function TapToDismiss() {
 });
 
 const PANEL_INSET = 8;
-const PANEL_WIDTH = DEVICE_WIDTH - PANEL_INSET * 2;
+export const PANEL_WIDTH = DEVICE_WIDTH - PANEL_INSET * 2;
 const PANEL_BORDER_RADIUS = 42;
 const LIST_SCROLL_INDICATOR_BOTTOM_INSET = { bottom: PANEL_BORDER_RADIUS };
 

diff --git a/src/components/animations/JiggleAnimation.tsx b/src/components/animations/JiggleAnimation.tsx
@@ -0,0 +1,67 @@
+import React, { useEffect } from 'react';
+import Animated, {
+  useSharedValue,
+  useAnimatedStyle,
+  withTiming,
+  withRepeat,
+  cancelAnimation,
+  useAnimatedReaction,
+  SharedValue,
+  withSequence,
+} from 'react-native-reanimated';
+
+type JiggleAnimationProps = {
+  amplitude?: number;
+  duration?: number;
+  children: React.ReactNode;
+  enabled: boolean | SharedValue<boolean>;
+};
+
+export function JiggleAnimation({ children, amplitude = 2, duration = 125, enabled }: JiggleAnimationProps) {
+  const rotation = useSharedValue(0);
+  const internalEnabled = useSharedValue(typeof enabled === 'boolean' ? enabled : false);
+
+  // Randomize some initial values to avoid sync with other jiggles
+  // Randomize duration (5% variance)
+  const instanceDuration = duration * (1 + (Math.random() - 0.5) * 0.1);
+
+  // Randomize initial rotation that's at least 50% of the amplitude
+  const minInitialRotation = amplitude * 0.5;
+  const rotationRange = amplitude - minInitialRotation;
+  const initialRotation = minInitialRotation + Math.random() * rotationRange;
+
+  // Randomize initial direction
+  const initialDirection = Math.random() < 0.5 ? -1 : 1;
+  const firstRotation = initialRotation * initialDirection;
+
+  useEffect(() => {
+    if (typeof enabled === 'boolean') {
+      internalEnabled.value = enabled;
+    }
+  }, [enabled, internalEnabled]);
+
+  useAnimatedReaction(
+    () => {
+      return typeof enabled === 'boolean' ? internalEnabled.value : (enabled as SharedValue<boolean>).value;
+    },
+    enabled => {
+      if (enabled) {
+        rotation.value = withSequence(
+          withTiming(firstRotation, { duration: instanceDuration / 2 }),
+          withRepeat(withTiming(-amplitude * initialDirection, { duration: instanceDuration }), -1, true)
+        );
+      } else {
+        cancelAnimation(rotation);
+        rotation.value = withTiming(0, { duration: instanceDuration / 2 });
+      }
+    }
+  );
+
+  const animatedStyle = useAnimatedStyle(() => {
+    return {
+      transform: [{ rotate: `${rotation.value}deg` }],
+    };
+  });
+
+  return <Animated.View style={animatedStyle}>{children}</Animated.View>;
+}
diff --git a/src/components/animations/animationConfigs.ts b/src/components/animations/animationConfigs.ts
@@ -25,6 +25,7 @@ const springAnimations = createSpringConfigs({
   keyboardConfig: disableForTestingEnvironment({ damping: 500, mass: 3, stiffness: 1000 }),
   sliderConfig: disableForTestingEnvironment({ damping: 40, mass: 1.25, stiffness: 450 }),
   slowSpring: disableForTestingEnvironment({ damping: 500, mass: 3, stiffness: 800 }),
+  walletDraggableConfig: disableForTestingEnvironment({ damping: 36, mass: 0.8, stiffness: 800 }),
   snappierSpringConfig: disableForTestingEnvironment({ damping: 42, mass: 0.8, stiffness: 800 }),
   snappySpringConfig: disableForTestingEnvironment({ damping: 100, mass: 0.8, stiffness: 275 }),
   springConfig: disableForTestingEnvironment({ damping: 100, mass: 1.2, stiffness: 750 }),

diff --git a/src/components/cards/MintsCard/Menu.tsx b/src/components/cards/MintsCard/Menu.tsx
@@ -39,7 +39,7 @@ export function Menu() {
   );
 
   return (
-    <DropdownMenu<MintsFilter> menuConfig={menuConfig} onPressMenuItem={onPressMenuItem}>
+    <DropdownMenu<MintsFilter> menuItemType="checkbox" menuConfig={menuConfig} onPressMenuItem={onPressMenuItem}>
       <ButtonPressAnimation>
         <Inset top="2px">
           <Inline alignVertical="center" space={{ custom: 5 }}>