Merge upstream develop

Author: github-actions[bot]

apps/polycentric/app.config.ts

@@ -11,13 +11,18 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   slug: 'polycentric',
   version: '0.0.1',
   orientation: 'portrait',
-  icon: './src/common/assets/images/PolycentricLogoWhite1024.png',
+  icon: './src/common/assets/images/app-icons/android-icon-foreground.png',
   scheme: 'polycentric',
   web: {
     output: 'server',
   },
   userInterfaceStyle: 'automatic',
   ios: {
+    icon: {
+      dark: './src/common/assets/images/app-icons/ios-icon-dark.png',
+      light: './src/common/assets/images/app-icons/ios-icon-default.png',
+      tinted: './src/common/assets/images/app-icons/ios-icon-monochrome.png',
+    },
     supportsTablet: true,
     bundleIdentifier: ID,
     infoPlist: {
@@ -30,10 +35,11 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   android: {
     adaptiveIcon: {
       foregroundImage:
-        './src/common/assets/images/PolycentricLogoTransparent1024.png',
+        './src/common/assets/images/app-icons/android-icon-foreground.png',
+      monochromeImage:
+        './src/common/assets/images/app-icons/android-icon-monochrome.png',
       backgroundColor: '#F2F5F9',
     },
-    edgeToEdgeEnabled: true,
     package: ID,
     permissions: ['android.permission.CAMERA'],
   },

apps/polycentric/app/(tabs)/_layout.tsx

@@ -33,11 +33,6 @@ export default function TabsLayout() {
         <NativeTabs.Trigger.Label>Activity</NativeTabs.Trigger.Label>
         <NativeTabs.Trigger.Icon sf="bell.fill" md="notifications" />
       </NativeTabs.Trigger>
-
-      <NativeTabs.Trigger name="settings">
-        <NativeTabs.Trigger.Label>Settings</NativeTabs.Trigger.Label>
-        <NativeTabs.Trigger.Icon sf="gearshape.fill" md="settings" />
-      </NativeTabs.Trigger>
     </NativeTabs>
   );
 }

apps/polycentric/app/(tabs)/activity.tsx

@@ -1,3 +1 @@
-export default function Activity() {
-  return null;
-}
+export { default } from '@/src/features/activity/ActivityScreen';

apps/polycentric/app/(tabs)/compose.tsx

@@ -0,0 +1 @@
+export { default } from '@/src/features/composer/ComposeScreen';

apps/polycentric/app/(tabs)/profile.tsx

@@ -0,0 +1 @@
+export { default } from '@/src/features/profile/ProfileScreen';

apps/polycentric/app/(tabs)/settings/_layout.tsx

@@ -45,14 +45,7 @@ function RootStack() {
             contentStyle: { backgroundColor: 'transparent' },
           }}
         />
-        <Stack.Screen
-          name="settings"
-          options={{
-            presentation: 'transparentModal',
-            animation: 'none',
-            contentStyle: { backgroundColor: 'transparent' },
-          }}
-        />
+        <Stack.Screen name="settings" />
         <Stack.Screen
           name="[identityId]/edit"
           options={{

apps/polycentric/app/_layout.tsx

@@ -1,5 +1,18 @@
-import { Slot } from 'expo-router';
+import { Stack } from 'expo-router';
 
-export default function SettingsOverlayLayout() {
-  return <Slot />;
+const sheetScreenOptions = {
+  presentation: 'transparentModal',
+  animation: 'none',
+  contentStyle: { backgroundColor: 'transparent' },
+} as const;
+
+export default function SettingsLayout() {
+  return (
+    <Stack screenOptions={{ headerShown: false }}>
+      <Stack.Screen name="index" />
+      <Stack.Screen name="identity" options={sheetScreenOptions} />
+      <Stack.Screen name="pair-identity" options={sheetScreenOptions} />
+      <Stack.Screen name="servers" options={sheetScreenOptions} />
+    </Stack>
+  );
 }