re-use custom bottom bar on desktop and Android. update ffi subscribe…

…r to work with boolean values
getlantern · Nov 26, 2023 · ca84816 · ca84816
1 parent 340bff1
commit ca84816
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 382 deletions.
diff --git a/desktop/lib.go b/desktop/lib.go
@@ -128,6 +128,16 @@ func EmailAddress() *C.char {
 	return C.CString("")
 }
 
+//export ChatEnabled
+func ChatEnabled() *C.char {
+	return C.CString("false")
+}
+
+//export ReplicaAddr
+func ReplicaAddr() *C.char {
+	return C.CString("")
+}
+
 // loadSettings loads the initial settings at startup, either from disk or using defaults.
 func loadSettings(configDir string) *app.Settings {
 	path := filepath.Join(configDir, "settings.yaml")

diff --git a/lib/common/ffi_subscriber.dart b/lib/common/ffi_subscriber.dart
@@ -1,6 +1,11 @@
 import 'common.dart';
 import 'common_desktop.dart';
 
+extension BoolParsing on String {
+  bool parseBool() {
+    return this.toLowerCase() == 'true';
+  }
+}
 
 class FfiValueNotifier<T> extends SubscribedNotifier<T?> {
   FfiValueNotifier(
@@ -10,7 +15,11 @@ class FfiValueNotifier<T> extends SubscribedNotifier<T?> {
     bool details = false,
     T Function(Uint8List serialized)? deserialize,
   }) : super(defaultValue, removeFromCache) {
-    value = ffiFunction().toDartString() as T?;
+    if (defaultValue is String?) {
+      value = ffiFunction().toDartString() as T?;
+    } else {
+      value = ffiFunction().toDartString().parseBool() as T?;
+    }
   }
 }
 

diff --git a/lib/common/session_model.dart b/lib/common/session_model.dart
@@ -240,9 +240,16 @@ class SessionModel extends Model {
   }
 
   Widget replicaAddr(ValueWidgetBuilder<String> builder) {
-    return subscribedSingleValueBuilder<String>(
+    if (Platform.isAndroid) {
+      return subscribedSingleValueBuilder<String>(
+        'replicaAddr',
+        defaultValue: '',
+        builder: builder,
+      );
+    }
+    return ffiValueBuilder<String>(
       'replicaAddr',
-      defaultValue: '',
+      ffiReplicaAddr,
       builder: builder,
     );
   }
@@ -264,8 +271,16 @@ class SessionModel extends Model {
   }
 
   Widget chatEnabled(ValueWidgetBuilder<bool> builder) {
-    return subscribedSingleValueBuilder<bool>(
+    if (Platform.isAndroid) {
+      return subscribedSingleValueBuilder<bool>(
+        'chatEnabled',
+        defaultValue: false,
+        builder: builder,
+      );
+    }
+    return ffiValueBuilder<bool>(
       'chatEnabled',
+      ffiChatEnabled,
       defaultValue: false,
       builder: builder,
     );

diff --git a/lib/custom_bottom_bar.dart b/lib/custom_bottom_bar.dart
@@ -16,9 +16,7 @@ class CustomBottomBar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return messagingModel
-        .getOnBoardingStatus((context, hasBeenOnboarded, child) {
-      return sessionModel.chatEnabled((context, chatEnabled, _) {
+    return sessionModel.chatEnabled((context, chatEnabled, _) {
         return sessionModel.replicaAddr((context, replicaAddr, child) {
           final replicaEnabled = replicaAddr != '';
 
@@ -57,14 +55,13 @@ class CustomBottomBar extends StatelessWidget {
               currentIndex,
               chatEnabled,
               replicaEnabled,
-              hasBeenOnboarded!,
+              true,
               isDevelop,
               isTesting,
               replicaAddr,
             ),
           );
         });
-      });
     });
   }
 

diff --git a/lib/custom_bottom_item.dart b/lib/custom_bottom_item.dart
@@ -1,4 +1,5 @@
 import 'package:lantern/common/common.dart';
+import 'package:lantern/common/common_desktop.dart';
 
 class CustomBottomBarItem extends StatelessWidget {
   const CustomBottomBarItem({
@@ -51,7 +52,13 @@ class CustomBottomBarItem extends StatelessWidget {
                 ),
               ),
               onTap: (() {
-                sessionModel.setSelectedTab(name);
+                if (Platform.isAndroid) {
+                  sessionModel.setSelectedTab(name);
+                } else {
+                  final tab = name.toNativeUtf8();
+                  setSelectTab(tab);
+                  context.pushRoute(DesktopHome());
+                }
               }),
               child: Container(
                 decoration: ShapeDecoration(

diff --git a/lib/desktop/custom_bottom_bar.dart b/lib/desktop/custom_bottom_bar.dart