re-use home and lantern app widgets on desktop

desktop/lib.go

@@ -128,11 +128,61 @@ func EmailAddress() *C.char {
 	return C.CString("")
 }
 
+//export Referral
+func Referral() *C.char {
+	return C.CString("")
+}
+
 //export ChatEnabled
 func ChatEnabled() *C.char {
 	return C.CString("false")
 }
 
+//export PlayVersion
+func PlayVersion() *C.char {
+	return C.CString("false")
+}
+
+//export StoreVersion
+func StoreVersion() *C.char {
+	return C.CString("false")
+}
+
+//export Lang
+func Lang() *C.char {
+	return C.CString("en")
+}
+
+//export Country
+func Country() *C.char {
+	return C.CString("US")
+}
+
+//export SdkVersion
+func SdkVersion() *C.char {
+	return C.CString("1.0.0")
+}
+
+//export VpnStatus
+func VpnStatus() *C.char {
+	return C.CString("disconnected")
+}
+
+//export HasSucceedingProxy
+func HasSucceedingProxy() *C.char {
+	return C.CString("true")
+}
+
+//export OnBoardingStatus
+func OnBoardingStatus() *C.char {
+	return C.CString("true")
+}
+
+//export AcceptedTermsVersion
+func AcceptedTermsVersion() *C.char {
+	return C.CString("0")
+}
+
 //export ProUser
 func ProUser() *C.char {
 	if isProUser, ok := a.IsProUser(); isProUser && ok {
@@ -141,6 +191,16 @@ func ProUser() *C.char {
 	return C.CString("false")
 }
 
+//export DevelopmentMode
+func DevelopmentMode() *C.char {
+	return C.CString("false")
+}
+
+//export SplitTunneling
+func SplitTunneling() *C.char {
+	return C.CString("false")
+}
+
 //export ReplicaAddr
 func ReplicaAddr() *C.char {
 	return C.CString("")

lib/app.dart

@@ -32,18 +32,20 @@ class LanternApp extends StatelessWidget {
     // Since this notification is visible on all screens and we want the
     // animation state to remain consistent across screens, we put the animation
     // controller here at the app level since the app contains all screens.
-    sessionModel.networkAvailable
-        .addListener(toggleConnectivityWarningIfNecessary);
-    sessionModel.proxyAvailable
-        .addListener(toggleConnectivityWarningIfNecessary);
-    networkWarningAnimationController = AnimationController(
-      duration: shortAnimationDuration,
-      vsync: _TickerProviderImpl(),
-    );
-    networkWarningAnimation = Tween(begin: 0.0, end: 1.0)
-        .animate(networkWarningAnimationController)
-      ..addListener(networkWarningAnimationChanged);
-    toggleConnectivityWarningIfNecessary();
+    if (Platform.isAndroid) {
+      sessionModel.networkAvailable
+          .addListener(toggleConnectivityWarningIfNecessary);
+      sessionModel.proxyAvailable
+          .addListener(toggleConnectivityWarningIfNecessary);
+      networkWarningAnimationController = AnimationController(
+        duration: shortAnimationDuration,
+        vsync: _TickerProviderImpl(),
+      );
+      networkWarningAnimation = Tween(begin: 0.0, end: 1.0)
+          .animate(networkWarningAnimationController)
+        ..addListener(networkWarningAnimationChanged);
+      toggleConnectivityWarningIfNecessary();
+    }
   }
 
   final translations = Localization.ensureInitialized();

lib/common/common_desktop.dart

@@ -1,6 +1,6 @@
 export 'dart:convert';
 export 'dart:ffi'; // For FFI
 
-export 'package:lantern/desktop/ffi.dart';
+export 'package:lantern/ffi.dart';
 export 'package:ffi/ffi.dart';
 export 'package:ffi/src/utf8.dart';

lib/common/ffi_subscriber.dart

@@ -15,11 +15,14 @@ class FfiValueNotifier<T> extends SubscribedNotifier<T?> {
     bool details = false,
     T Function(Uint8List serialized)? deserialize,
   }) : super(defaultValue, removeFromCache) {
-    if (defaultValue is String?) {
+    if (defaultValue is int?) {
+      value = int.parse(ffiFunction().toDartString()) as T?;
+    } else if (defaultValue is String) {
       value = ffiFunction().toDartString() as T?;
     } else {
       value = ffiFunction().toDartString().parseBool() as T?;
     }
+    cancel = () => {};
   }
 }
 

lib/common/model.dart

@@ -17,8 +17,10 @@ abstract class Model {
   final Map<String, FfiListNotifier> _ffiListNotifierCache = HashMap();
 
   Model(String name) {
-    methodChannel = MethodChannel('${name}_method_channel');
-    _updatesChannel = ModelEventChannel('${name}_event_channel');
+    if (Platform.isAndroid) {
+      methodChannel = MethodChannel('${name}_method_channel');
+      _updatesChannel = ModelEventChannel('${name}_event_channel');
+    }
   }
 
   Future<T> get<T>(String path) async {
@@ -93,7 +95,7 @@ abstract class Model {
       T Function(Uint8List serialized)? deserialize,      
   }) {
     var result =
-        _ffiValueNotifierCache[path] as FfiValueNotifier<T>?;
+        _ffiValueNotifierCache[path] as FfiValueNotifier<T?>?;
     if (result == null) {
       result = FfiValueNotifier(
         ffiFunction,