Develop

android/app/src/main/assets/airbridge.json

@@ -1,8 +1,8 @@
 {
-    "sdkEnabled": true,
-    "logLevel": "info",
-    "autoStartTrackingEnabled": true,
-    "sessionTimeoutInSecond": 300,
-    "hashUserInformationEnabled": true,
-    "trackAirbridgeDeeplinkOnlyEnabled": true
+  "sdkEnabled": true,
+  "logLevel": "info",
+  "autoStartTrackingEnabled": true,
+  "sessionTimeoutInSecond": 300,
+  "hashUserInformationEnabled": true,
+  "trackAirbridgeDeeplinkOnlyEnabled": true
 }

lib/core/config/router/app_router.dart

@@ -86,6 +86,10 @@ final appRouterProvider = Provider<GoRouter>((ref) {
   return GoRouter(
     navigatorKey: rootNavigatorKey,
     initialLocation: AppRoutes.home,
+    // App links are consumed explicitly by AppLinksDeepLinkService. If
+    // go_router also uses the platform launch URL during cold start, the same
+    // deep link can be inserted twice and leave a stale page under Back.
+    overridePlatformDefaultLocation: true,
     debugLogDiagnostics: true,
     observers: [ref.read(analyticsServiceProvider).routeObserver],
 

lib/core/constants/app_assets.dart

@@ -70,9 +70,11 @@ class AppAssets {
 
   // ========== COMMON UI ICONS ==========
   static const IconData caretRight = PhosphorIconsRegular.caretRight;
+  static const IconData caretRight2 = PhosphorIconsBold.caretRight;
   static const IconData caretDown = PhosphorIconsRegular.caretDown;
   static const IconData caretUp = PhosphorIconsRegular.caretUp;
   static const IconData caretLeft = PhosphorIconsRegular.caretLeft;
+  static const IconData caretLeft2 = PhosphorIconsBold.caretLeft;
   static const IconData arrowSquareOut = PhosphorIconsRegular.arrowSquareOut;
   static const IconData arrowLeft = PhosphorIconsRegular.arrowLeft;
   static const IconData lock = PhosphorIconsRegular.lock;
@@ -81,7 +83,9 @@ class AppAssets {
 
   // ========== ACTION ICONS ==========
   static const IconData plus = PhosphorIconsRegular.plus;
+  static const IconData plusCircle = PhosphorIconsRegular.plusCircle;
   static const IconData minus = PhosphorIconsRegular.minus;
+  static const IconData minusCircle = PhosphorIconsRegular.minusCircle;
   static const IconData play = PhosphorIconsFill.play;
   static const IconData pause = PhosphorIconsFill.pause;
   static const IconData list = PhosphorIconsRegular.list;

lib/core/deep_linking/app_links_deep_link_service.dart

@@ -17,7 +17,12 @@ class AppLinksDeepLinkService {
   StreamSubscription<Uri>? _subscription;
   GoRouter? _router;
   Uri? _pendingUri;
+  Uri? _lastDispatchedUri;
+  DateTime? _lastDispatchedAt;
   bool _initialized = false;
+  void Function(int tabIndex)? _tabSetter;
+
+  static const Duration _duplicateDispatchWindow = Duration(seconds: 5);
 
   Future<void> initialize() async {
     if (_initialized) return;
@@ -50,6 +55,10 @@ class AppLinksDeepLinkService {
     _router = router;
   }
 
+  void setTabSetter(void Function(int tabIndex) setter) {
+    _tabSetter = setter;
+  }
+
   bool drainPendingLink() {
     if (_router == null) return false;
 
@@ -73,6 +82,16 @@ class AppLinksDeepLinkService {
       return;
     }
 
+    if (_pendingUri == uri) {
+      _logger.debug('Ignoring duplicate pending app link: $uri');
+      return;
+    }
+
+    if (_wasRecentlyDispatched(uri)) {
+      _logger.debug('Ignoring recently dispatched app link: $uri');
+      return;
+    }
+
     if (_router == null) {
       _pendingUri = uri;
       _logger.info('Router not ready, stored app link: $uri');
@@ -82,15 +101,34 @@ class AppLinksDeepLinkService {
     _dispatch(uri);
   }
 
-  void _dispatch(Uri uri, {String? baseLocation}) {
+  bool _dispatch(Uri uri, {String? baseLocation}) {
     final router = _router;
-    if (router == null) return;
+    if (router == null) return false;
+
+    if (_wasRecentlyDispatched(uri)) {
+      _logger.debug('Skipping duplicate app link dispatch: $uri');
+      return false;
+    }
 
-    DeepLinkRouter.route(
+    final routed = DeepLinkRouter.route(
       uri,
       router,
       source: 'app_links',
       baseLocation: baseLocation,
+      tabSetter: _tabSetter,
     );
+    if (routed) {
+      _lastDispatchedUri = uri;
+      _lastDispatchedAt = DateTime.now();
+    }
+    return routed;
+  }
+
+  bool _wasRecentlyDispatched(Uri uri) {
+    final lastUri = _lastDispatchedUri;
+    final lastAt = _lastDispatchedAt;
+    if (lastUri != uri || lastAt == null) return false;
+
+    return DateTime.now().difference(lastAt) < _duplicateDispatchWindow;
   }
 }

lib/core/deep_linking/deep_link_router.dart

@@ -14,6 +14,7 @@ class DeepLinkRouter {
     GoRouter router, {
     required String source,
     String? baseLocation,
+    void Function(int tabIndex)? tabSetter,
   }) {
     try {
       final destination = _resolveRoute(uri);
@@ -33,6 +34,14 @@ class DeepLinkRouter {
       } else {
         router.go(destination.location, extra: destination.extra);
       }
+
+      final tabIndex = destination.tabIndex;
+      if (tabIndex != null && tabSetter != null) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          tabSetter(tabIndex);
+        });
+      }
+
       return true;
     } catch (e, stackTrace) {
       _logger.error(
@@ -67,9 +76,7 @@ class DeepLinkRouter {
     }
 
     if (uri.scheme.toLowerCase() == 'webuddhist') {
-      return _DeepLinkDestination(
-        _routeForWebuddhistHost(uri.host.toLowerCase()),
-      );
+      return _resolveWebuddhistSchemeLink(uri.host.toLowerCase());
     }
 
     if (isAirbridgeLink(uri)) {
@@ -127,39 +134,84 @@ class DeepLinkRouter {
       }
     }
 
+    if (segments.length >= 2 &&
+        segments[0] == 'open' &&
+        segments[1] == 'more') {
+      return const _DeepLinkDestination(AppRoutes.home, tabIndex: _meTabIndex);
+    }
+
+    if (segments.length >= 3 &&
+        segments[0] == 'open' &&
+        segments[1] == 'group') {
+      final groupId = segments[2];
+      return _DeepLinkDestination(
+        '/home/group/$groupId',
+        opensOnTop: true,
+      );
+    }
+
+    if (segments.length >= 3 &&
+        segments[0] == 'open' &&
+        segments[1] == 'mala') {
+      final presetId = segments[2];
+      return _DeepLinkDestination(
+        AppRoutes.mala,
+        extra: {'presetId': presetId},
+        opensOnTop: true,
+      );
+    }
+
+    if (segments.length >= 3 &&
+        segments[0] == 'open' &&
+        segments[1] == 'timer') {
+      return const _DeepLinkDestination(
+        '/home/timers',
+        opensOnTop: true,
+      );
+    }
+
     return const _DeepLinkDestination(AppRoutes.home);
   }
 
-  static String _routeForWebuddhistHost(String host) {
+  static _DeepLinkDestination _resolveWebuddhistSchemeLink(String host) {
     switch (host) {
       case 'open':
       case 'home':
-        return AppRoutes.home;
+        return const _DeepLinkDestination(AppRoutes.home);
       case 'practice':
-        return AppRoutes.practice;
+        return const _DeepLinkDestination(AppRoutes.practice);
       case 'texts':
-        return AppRoutes.texts;
+        return const _DeepLinkDestination(AppRoutes.texts);
       case 'more':
-        return AppRoutes.more;
+        return const _DeepLinkDestination(AppRoutes.home, tabIndex: _meTabIndex);
       case 'profile':
-        return AppRoutes.profile;
+        return const _DeepLinkDestination(AppRoutes.profile);
       case 'notifications':
-        return AppRoutes.notifications;
+        return const _DeepLinkDestination(AppRoutes.notifications);
       default:
         _logger.warning('Unknown webuddhist deep link host: $host');
-        return AppRoutes.home;
+        return const _DeepLinkDestination(AppRoutes.home);
     }
   }
 }
 
+/// Bottom nav tab index for the Me screen (matches MainTab.me.index == 3).
+const int _meTabIndex = 3;
+
 class _DeepLinkDestination {
   final String location;
   final Object? extra;
   final bool opensOnTop;
 
+  /// When non-null, the deep-link handler should switch the bottom nav bar to
+  /// this tab index after navigating. Used for tab-based screens that share
+  /// the `/home` route (e.g. the Me tab).
+  final int? tabIndex;
+
   const _DeepLinkDestination(
     this.location, {
     this.extra,
     this.opensOnTop = false,
+    this.tabIndex,
   });
 }

lib/core/deep_linking/deep_link_url_builder.dart

@@ -42,4 +42,32 @@ class DeepLinkUrlBuilder {
       queryParameters: queryParameters,
     );
   }
+
+  static Uri moreLink() {
+    return Uri(scheme: 'https', host: _host, pathSegments: ['open', 'more']);
+  }
+
+  static Uri groupLink({required String groupId}) {
+    return Uri(
+      scheme: 'https',
+      host: _host,
+      pathSegments: ['open', 'group', groupId],
+    );
+  }
+
+  static Uri malaLink({required String presetId}) {
+    return Uri(
+      scheme: 'https',
+      host: _host,
+      pathSegments: ['open', 'mala', presetId],
+    );
+  }
+
+  static Uri timerLink({required String timerId}) {
+    return Uri(
+      scheme: 'https',
+      host: _host,
+      pathSegments: ['open', 'timer', timerId],
+    );
+  }
 }

lib/core/l10n/app_bo.arb

@@ -56,7 +56,14 @@
   "home_shortcut_plans": "ཉམས་ལེན།",
   "home_chants": "ཞལ་འདོན།",
   "home_mala": "ཕྲེང་བ།",
+  "session_mala": "ཕྲེང་བ་རྣམས།",
+  "bookmark_mala": "ཕྲེང་བ་རྣམས།",
+  "bookmark_timers": "སྒོམ་ཐུན་རྣམས།",
+  "bookmark_texts": "གསུང་རབ།",
   "mala_add_to_practice": "ངའི་ཉམས་ལེན་ནང་སྣོན།",
+  "mala_add_mala_round": "Add mala round",
+  "mala_add_rounds_title": "Add mala rounds:",
+  "mala_add_rounds_message": "Add the number of mala rounds you did outside this app.",
   "mala_add_to_bookmark": "དཔེ་རྟགས།",
   "mala_sound": "སྒྲ།",
   "mala_vibration": "འདར་འགུལ།",
@@ -710,10 +717,29 @@
   "group_links_title": "འབྲེལ་ཐག",
   "group_and_more_links": "དང་འབྲེལ་ཐག་གཞན་ {count}",
   "group_practice_with_us": "ང་ཚོ་དང་མཉམ་དུ་སྒོམ་གྱི།",
+  "group_join_to_contribute": "བསགས་གྲངས་སྐྱེལ་ཆེད་ཞུགས།",
+  "group_accumulator_join_error": "བསགས་གྲངས་ལ་ཞུགས་མ་ཐུབ། ཡང་བསྐྱར་ཚོད་ལྟ་གནང་རོགས།",
+  "group_accumulator_participants": "མཉམ་ཞུགས་པ་ {count}",
+  "group_accumulator_leaderboard": "རིམ་པའི་ཐོ།",
+  "group_accumulator_my_contributions": "ངའི་སྐྱེལ་མ།",
+  "group_accumulator_recited": "བཟླས་བརྗོད།",
+  "group_accumulator_total": "ཁྱོན་བསྡོམས།",
+  "group_accumulator_contributions_empty": "ཁྱེད་ཀྱི་སྐྱེལ་མ་ལ་རྗེས་འདེད་བྱེད་ཆེད་བསགས་གྲངས་འདིར་ཞུགས་རོགས།",
+  "group_accumulator_recite_now": "ད་ལྟ་བཟླས་བརྗོད་གནང་།",
 
   "share_this_quote": "གསུང་ཚིག་འདི་སྤེལ།",
   "shared_from": "སྤེལ་ཁུངས།",
   "verse_share_error": "གསུང་ཚིག་སྤེལ་མ་ཐུབ། བསྐྱར་དུ་ཚོད་ལྟ་བྱོས།",
+  "share_app_message": "ངས་ཉིན་རེའི་ནང་ཆོས་ཉམས་ལེན་གྱི་སྤྱོད་ལམ་སྦྱོང་བར་འཕྲིན་ཆས་འདི་བཀོལ་སྤྱོད་བྱེད་ཀྱི་ཡོད། ཁྱོད་ཀྱིས་ཀྱང་ལས་དེ་དགའ་བར་ངས་བསམ་གྱི་ཡོད།",
+  "share_streak_message": "ངས་ཉིན་རེའི་ཉམས་ལེན་གྱི་དུས་ཚོད་གསབ་སྐྱོང་བྱེད་མཁན་ཞིག་ཡིན་པ་ཁྱོད་དང་མཉམ་དུ་བགྲོ་གླེང་བྱེད་འདོད། གྲོགས་པོ་མཉམ་ཞུགས་ཀྱིས་ཉམས་ལེན་སྤེལ་ཐབས་སྟབས་བདེ་ཆེར་འགྲོ། WeBuddhist ཐོག་ང་མཉམ་ཞུགས་མཛོད།",
+  "share_chant_message": "ངས་མགུར་འདི་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། ཁྱོད་ཀྱིས་དེ་ཉམས་ལེན་བྱེད་ཐུབ་ཅིང་ WeBuddhist ཐོག་མགུར་གཞུང་ཆེན་པོའི་མཛོད་དུ་རྒྱུ་ཐུབ།",
+  "share_quote_message": "WeBuddhist ཐོག་གི་གསུང་ཚིག་འདི་ངར་དགར་སོང་བས་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། WeBuddhist ཉེར་སྤྱོད་ཐོག་ལྟ་ཀློག་ཕྱི་བཀྲམ་གྱི་ཚིག་རྒྱུག་མང་པོ་དཔྱད།",
+  "share_mala_message": "ངས་ WeBuddhist ཐོག་གི་གློག་རྡུལ་ཕྲེང་བ་འདི་བཀོལ་སྤྱོད་བྱེད་ཀྱི་ཡོད་ཅིང་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། གང་དུ་ཡིན་ཡང་ཉམས་ལེན་བྱེད་ལ་ཐབས་སྟབས་བདེ་བ་ཞིག་ཡིན།",
+  "share_passage_message": "ངས་ཚིགས་མ་འདི་དགར་སོང་བས་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། ཁྱོད་ཀྱིས་ WeBuddhist ཐོག་གི་ཚིག་རྒྱུག་མཐར་ཐུག་གི་ལྟ་ཀློག་བྱེད་ཐུབ།",
+  "share_timer_message": "ངས་ WeBuddhist ཐོག་གི་བསམ་གཏན་དུས་ཚོད་རྩིས་འདི་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། བསམ་གཏན་གྱི་ཉམས་ལེན་ཡར་སྤེལ་བར་ཐབས་སྟབས་བདེ།",
+  "share_plan_message": "ངས་ཆོས་ཉམས་ལེན་གྱི་འཆར་གཞི་འདི་རྗེས་སུ་འབྲང་ཞིང་ཁྱོད་དང་མཉམ་བགྲོ་བར་འདོད། ཁྱོད་ཀྱིས་ WeBuddhist ཐོག་གིས་རིན་མེད་ང་མཉམ་ཞུགས་བྱེད་ཐུབ།",
+  "share_plan_subject": "WeBuddhist ཐོག་ང་མཉམ་ཞུགས་མཛོད།",
+  "share_group_invite_message": "ངའི་སྡེ་ཚན་དུ་ཁྱོད་ཞུགས་ན་སྙིང་གི་དགའ་བ། WeBuddhist ཐོག་མཉམ་དུ་ཉམས་ལེན་བྱོས།",
   "connect_subtitle": "ཁྱེད་ཀྱི་ཚོགས་པ་བཙལ་ཏེ་མཉམ་དུ་ཉམས་ལེན་བྱོས།",
   "discover_groups": "ཚོགས་པ་འཚོལ།",
   "my_groups": "ངའི་ཚོགས་པ།",

lib/core/l10n/app_en.arb

@@ -56,7 +56,14 @@
   "home_shortcut_plans": "Plans",
   "home_chants": "Chants",
   "home_mala": "Mala",
+  "session_mala": "Malas",
+  "bookmark_mala": "Malas",
+  "bookmark_timers": "Timers",
+  "bookmark_texts": "Texts",
   "mala_add_to_practice": "Add to my practices",
+  "mala_add_mala_round": "Add mala round",
+  "mala_add_rounds_title": "Add mala rounds:",
+  "mala_add_rounds_message": "Add the number of mala rounds you did outside this app.",
   "mala_add_to_bookmark": "Bookmark",
   "mala_sound": "Sound",
   "mala_vibration": "Vibration",
@@ -804,6 +811,7 @@
   "group_accumulator_recited": "Recited",
   "group_accumulator_total": "Total",
   "group_accumulator_contributions_empty": "Join this accumulation to track your contributions.",
+  "group_accumulator_recite_now": "Recite now",
   "@group_and_more_links": {
     "placeholders": {
       "count": {
@@ -815,6 +823,16 @@
   "share_this_quote": "Share this quote",
   "shared_from": "Shared from",
   "verse_share_error": "Unable to share quote. Please try again",
+  "share_app_message": "I've been using this app to build a daily Buddhist practice, and thought you'd love it.",
+  "share_streak_message": "I've been building a daily practice habit and wanted to share it with you. It's easier to keep it up with a friend. Join me on WeBuddhist.",
+  "share_chant_message": "I wanted to share this chant with you. You can practice it and find a whole library of other chants and texts on WeBuddhist.",
+  "share_quote_message": "I liked this quote from WeBuddhist and wanted to share it with you. Read more such insightful quotes on the WeBuddhist App",
+  "share_mala_message": "I've been using this digital mala on WeBuddhist and wanted to share it with you. It's an easy way to practice wherever you go.",
+  "share_passage_message": "I liked this passage and wanted to share it with you. You can read the whole quote in context on WeBuddhist.",
+  "share_timer_message": "I wanted to share this meditation timer from WeBuddhist with you. It makes it easy to build a meditation practice.",
+  "share_plan_message": "I'm following this Buddhist practice plan and wanted to share it with you. You can join me for free on WeBuddhist.",
+  "share_plan_subject": "Join me on WeBuddhist",
+  "share_group_invite_message": "I'd love for you to join our group. Let's practice together on WeBuddhist.",
   "weekday_monday": "MON",
   "weekday_tuesday": "TUE",
   "weekday_wednesday": "WED",