intermediate

app/lib/features/web_view/domain/entities/abstract/tab.dart

@@ -1,5 +1,4 @@
 import 'package:drift/drift.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 
 abstract interface class ITab {
   String get id;

app/lib/features/web_view/domain/entities/consistent_controller.dart

@@ -1,5 +1,3 @@
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-
 class ConsistentController {
   final InAppWebViewController? value;
 

app/lib/features/web_view/domain/entities/web_view_page.dart

@@ -1,10 +1,9 @@
 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:fast_equatable/fast_equatable.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+
 import 'package:lensai/core/uuid.dart';
-import 'package:lensai/domain/entities/web_page_info.dart';
-import 'package:lensai/features/web_view/domain/entities/abstract/tab.dart';
+import 'package:lensai/data/models/web_page_info.dart';
 
 part 'web_view_page.g.dart';
 

app/lib/features/web_view/domain/entities/web_view_page.g.dart

@@ -7,17 +7,17 @@ part of 'web_view_page.dart';
 // **************************************************************************
 
 abstract class _$WebViewPageCWProxy {
-  WebViewPage controller(InAppWebViewController? controller);
+  WebViewPage controller(InvalidType controller);
 
   WebViewPage url(Uri url);
 
-  WebViewPage sslError(SslError? sslError);
+  WebViewPage sslError(InvalidType sslError);
 
   WebViewPage title(String? title);
 
   WebViewPage topicId(String? topicId);
 
-  WebViewPage favicon(Favicon? favicon);
+  WebViewPage favicon(BrowserIcon? favicon);
 
   WebViewPage screenshot(Uint8List? screenshot);
 
@@ -30,12 +30,12 @@ abstract class _$WebViewPageCWProxy {
   /// WebViewPage(...).copyWith(id: 12, name: "My name")
   /// ````
   WebViewPage call({
-    InAppWebViewController? controller,
+    InvalidType? controller,
     Uri? url,
-    SslError? sslError,
+    InvalidType? sslError,
     String? title,
     String? topicId,
-    Favicon? favicon,
+    BrowserIcon? favicon,
     Uint8List? screenshot,
     ({bool canGoBack, bool canGoForward})? pageHistory,
   });
@@ -48,14 +48,14 @@ class _$WebViewPageCWProxyImpl implements _$WebViewPageCWProxy {
   final WebViewPage _value;
 
   @override
-  WebViewPage controller(InAppWebViewController? controller) =>
+  WebViewPage controller(InvalidType controller) =>
       this(controller: controller);
 
   @override
   WebViewPage url(Uri url) => this(url: url);
 
   @override
-  WebViewPage sslError(SslError? sslError) => this(sslError: sslError);
+  WebViewPage sslError(InvalidType sslError) => this(sslError: sslError);
 
   @override
   WebViewPage title(String? title) => this(title: title);
@@ -64,7 +64,7 @@ class _$WebViewPageCWProxyImpl implements _$WebViewPageCWProxy {
   WebViewPage topicId(String? topicId) => this(topicId: topicId);
 
   @override
-  WebViewPage favicon(Favicon? favicon) => this(favicon: favicon);
+  WebViewPage favicon(BrowserIcon? favicon) => this(favicon: favicon);
 
   @override
   WebViewPage screenshot(Uint8List? screenshot) => this(screenshot: screenshot);
@@ -93,18 +93,19 @@ class _$WebViewPageCWProxyImpl implements _$WebViewPageCWProxy {
   }) {
     return WebViewPage(
       id: _value.id,
-      controller: controller == const $CopyWithPlaceholder()
-          ? _value.controller
-          // ignore: cast_nullable_to_non_nullable
-          : controller as InAppWebViewController?,
+      controller:
+          controller == const $CopyWithPlaceholder() || controller == null
+              ? _value.controller
+              // ignore: cast_nullable_to_non_nullable
+              : controller as InvalidType,
       url: url == const $CopyWithPlaceholder() || url == null
           ? _value.url
           // ignore: cast_nullable_to_non_nullable
           : url as Uri,
-      sslError: sslError == const $CopyWithPlaceholder()
+      sslError: sslError == const $CopyWithPlaceholder() || sslError == null
           ? _value.sslError
           // ignore: cast_nullable_to_non_nullable
-          : sslError as SslError?,
+          : sslError as InvalidType,
       title: title == const $CopyWithPlaceholder()
           ? _value.title
           // ignore: cast_nullable_to_non_nullable
@@ -116,7 +117,7 @@ class _$WebViewPageCWProxyImpl implements _$WebViewPageCWProxy {
       favicon: favicon == const $CopyWithPlaceholder()
           ? _value.favicon
           // ignore: cast_nullable_to_non_nullable
-          : favicon as Favicon?,
+          : favicon as BrowserIcon?,
       screenshot: screenshot == const $CopyWithPlaceholder()
           ? _value.screenshot
           // ignore: cast_nullable_to_non_nullable

app/lib/features/web_view/domain/providers.dart

@@ -5,8 +5,8 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:lensai/features/content_block/domain/repositories/host.dart';
 import 'package:lensai/features/settings/data/models/settings.dart';
 import 'package:lensai/features/settings/data/repositories/settings_repository.dart';
-import 'package:lensai/features/topics/domain/providers.dart';
-import 'package:lensai/features/topics/domain/repositories/tab.dart';
+import 'package:lensai/features/geckoview/features/topics/domain/providers.dart';
+import 'package:lensai/features/geckoview/features/topics/domain/repositories/tab_link.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:universal_io/io.dart';
 

app/lib/features/web_view/domain/repositories/web_view.dart

@@ -1,11 +1,11 @@
 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:drift/drift.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lensai/core/logger.dart';
-import 'package:lensai/features/topics/data/providers.dart';
-import 'package:lensai/features/topics/domain/providers.dart';
-import 'package:lensai/features/topics/domain/repositories/tab.dart';
+import 'package:lensai/features/geckoview/features/topics/data/providers.dart';
+import 'package:lensai/features/geckoview/features/topics/domain/providers.dart';
+import 'package:lensai/features/geckoview/features/topics/domain/repositories/tab_link.dart';
 import 'package:lensai/features/web_view/domain/entities/consistent_controller.dart';
 import 'package:lensai/features/web_view/domain/entities/web_view_page.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';