show bottom bar, updates to show translations and plans + checkout pages

getlantern · Nov 26, 2023 · 168f8d3 · 168f8d3
1 parent bf98f68
commit 168f8d3
Show file tree

Hide file tree

Showing 21 changed files with 1,641 additions and 705 deletions.
diff --git a/desktop/lib.go b/desktop/lib.go
@@ -10,6 +10,7 @@ import (
 	"runtime"
 	"runtime/debug"
 	"strconv"
+	"sync"
 
 	"github.com/getlantern/appdir"
 	"github.com/getlantern/android-lantern/desktop/app"
@@ -23,6 +24,8 @@ import "C"
 
 var (
 	log = golog.LoggerFor("lantern-desktop.main")
+	selectedTab = "account"
+	selectedTabMu sync.Mutex
 	proClient *pro.ProClient
 	settings *app.Settings 
 )
@@ -84,6 +87,18 @@ func sendError(err error) *C.char {
 	return C.CString(string(b))
 }
 
+//export SelectedTab
+func SelectedTab() *C.char {
+	return C.CString(selectedTab)
+}
+
+//export SetSelectTab
+func SetSelectTab(tab string) {
+	selectedTabMu.Lock()
+	defer selectedTabMu.Unlock()
+	selectedTab = tab
+}
+
 //export Plans
 func Plans() *C.char {
 	deviceID, userID, token := userHeaders()

diff --git a/desktop/pro/pro.pb.go b/desktop/pro/pro.pb.go
diff --git a/desktop/pro/pro.proto b/desktop/pro/pro.proto
@@ -14,14 +14,16 @@ message Duration {
 }
 
 message Plan {
-    string id = 1;
-    string description = 2;
-    Duration duration = 3;
-    map<string, uint32> price = 4;
-    map<string, uint32> expectedMonthlyPrice = 5;
-    uint32 usdPrice = 6;
-    uint32 usdPrice1Y = 7;
-    uint32 usdPrice2Y = 8;
+  string id = 1;
+  string description = 2;
+  bool bestValue = 3;
+  int64 usdPrice = 4;
+  map<string, int64> price = 5;
+  string totalCostBilledOneTime = 6;
+  string oneMonthCost = 7;
+  string totalCost = 8;
+  string formattedBonus = 9;
+  string renewalText = 10;
 }
 
 message PlansResponse {

diff --git a/lib/app_desktop.dart b/lib/app_desktop.dart
diff --git a/lib/core/router/router.dart b/lib/core/router/router.dart
@@ -1,9 +1,8 @@
 import 'package:auto_route/auto_route.dart';
+import 'package:lantern/common/common.dart';
 import 'package:lantern/common/ui/transitions.dart';
 import 'package:lantern/core/router/router.gr.dart';
 
-
-
 @AutoRouterConfig(
   replaceInRouteName: 'Page,Route,Screen',
 )
@@ -12,7 +11,7 @@ class AppRouter extends $AppRouter {
   RouteType get defaultRouteType => const RouteType.adaptive();
   @override
   final List<AutoRoute> routes = [
-    AutoRoute(path: '/', page: Home.page),
+    AutoRoute(path: '/', page: Platform.isAndroid ? Home.page : DesktopHome.page),
     CustomRoute(
         page: FullScreenDialogPage.page,
         path: '/fullScreenDialogPage',
@@ -157,6 +156,12 @@ class AppRouter extends $AppRouter {
         transitionsBuilder: defaultTransition,
         durationInMilliseconds: defaultTransitionMillis,
         reverseDurationInMilliseconds: defaultTransitionMillis),
+    CustomRoute(
+        page: PlansDesktop.page,
+        path: '/plansdesktop',
+        transitionsBuilder: defaultTransition,
+        durationInMilliseconds: defaultTransitionMillis,
+        reverseDurationInMilliseconds: defaultTransitionMillis),
     CustomRoute(
         page: ReplicaUploadTitle.page,
         path: '/replicaUploadTitle',