Merge pull request #474 from OpenPecha/bug-fixing

tentamdin · web-flow · commit 48d492c69d7c · 2026-07-01T22:21:44.000+05:30
fix: bug fixes
diff --git a/lib/core/l10n/app_bo.arb b/lib/core/l10n/app_bo.arb
@@ -112,6 +112,7 @@
   "nav_settings": "སྒྲིག་འགོད།",
   "nav_connect": "མཐུད།",
   "nav_me": "ང་།",
+  "tab_practices": "ཉམས་ལེན།",
   "text_search": "འཚོལ།",
   "text_toc_versions": "པར་གཞི།",
   "text_commentary": "འགྲེལ་བ་ཁག",
diff --git a/lib/core/l10n/app_en.arb b/lib/core/l10n/app_en.arb
@@ -112,6 +112,7 @@
   "nav_settings": "Settings",
   "nav_connect": "Connect",
   "nav_me": "Me",
+  "tab_practices": "Practices",
   "text_search": "Search",
   "text_toc_versions": "Versions",
   "text_commentary": "Commentaries",
diff --git a/lib/core/l10n/app_hi.arb b/lib/core/l10n/app_hi.arb
@@ -112,6 +112,7 @@
   "nav_settings": "सेटिंग्स",
   "nav_connect": "कनेक्ट",
   "nav_me": "मैं",
+  "tab_practices": "अभ्यास",
   "text_search": "खोजें",
   "text_toc_versions": "संस्करण",
   "text_commentary": "टीकाएँ",
diff --git a/lib/core/l10n/app_mn.arb b/lib/core/l10n/app_mn.arb
@@ -112,6 +112,7 @@
   "nav_settings": "Тохиргоо",
   "nav_connect": "Холбогдох",
   "nav_me": "Би",
+  "tab_practices": "Дадлага",
   "text_search": "Хайх",
   "text_toc_versions": "Хувилбарууд",
   "text_commentary": "Тайлбар",
diff --git a/lib/core/l10n/app_ne.arb b/lib/core/l10n/app_ne.arb
@@ -112,6 +112,7 @@
   "nav_settings": "सेटिङ",
   "nav_connect": "जोडिनुहोस्",
   "nav_me": "म",
+  "tab_practices": "अभ्यास",
   "text_search": "खोज्नुहोस्",
   "text_toc_versions": "संस्करणहरू",
   "text_commentary": "टीकाहरू",
diff --git a/lib/core/l10n/app_zh.arb b/lib/core/l10n/app_zh.arb
@@ -112,6 +112,7 @@
   "nav_settings": "設定",
   "nav_connect": "社群",
   "nav_me": "個人",
+  "tab_practices": "修持計畫",
   "text_search": "搜尋",
   "text_toc_versions": "版本",
   "text_commentary": "注釋",
diff --git a/lib/core/l10n/generated/app_localizations.dart b/lib/core/l10n/generated/app_localizations.dart
@@ -532,6 +532,12 @@ abstract class AppLocalizations {
   /// **'Me'**
   String get nav_me;
 
+  /// No description provided for @tab_practices.
+  ///
+  /// In en, this message translates to:
+  /// **'Practices'**
+  String get tab_practices;
+
   /// No description provided for @text_search.
   ///
   /// In en, this message translates to:
diff --git a/lib/core/l10n/generated/app_localizations_bo.dart b/lib/core/l10n/generated/app_localizations_bo.dart
@@ -249,6 +249,9 @@ class AppLocalizationsBo extends AppLocalizations {
   @override
   String get nav_me => 'ང་།';
 
+  @override
+  String get tab_practices => 'ཉམས་ལེན།';
+
   @override
   String get text_search => 'འཚོལ།';
 
diff --git a/lib/core/l10n/generated/app_localizations_en.dart b/lib/core/l10n/generated/app_localizations_en.dart
@@ -247,6 +247,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get nav_me => 'Me';
 
+  @override
+  String get tab_practices => 'Practices';
+
   @override
   String get text_search => 'Search';
 
diff --git a/lib/core/l10n/generated/app_localizations_hi.dart b/lib/core/l10n/generated/app_localizations_hi.dart
@@ -247,6 +247,9 @@ class AppLocalizationsHi extends AppLocalizations {
   @override
   String get nav_me => 'मैं';
 
+  @override
+  String get tab_practices => 'अभ्यास';
+
   @override
   String get text_search => 'खोजें';
 
diff --git a/lib/core/l10n/generated/app_localizations_mn.dart b/lib/core/l10n/generated/app_localizations_mn.dart
@@ -248,6 +248,9 @@ class AppLocalizationsMn extends AppLocalizations {
   @override
   String get nav_me => 'Би';
 
+  @override
+  String get tab_practices => 'Дадлага';
+
   @override
   String get text_search => 'Хайх';
 
diff --git a/lib/core/l10n/generated/app_localizations_ne.dart b/lib/core/l10n/generated/app_localizations_ne.dart
@@ -248,6 +248,9 @@ class AppLocalizationsNe extends AppLocalizations {
   @override
   String get nav_me => 'म';
 
+  @override
+  String get tab_practices => 'अभ्यास';
+
   @override
   String get text_search => 'खोज्नुहोस्';
 
diff --git a/lib/core/l10n/generated/app_localizations_zh.dart b/lib/core/l10n/generated/app_localizations_zh.dart
@@ -238,6 +238,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get nav_me => '個人';
 
+  @override
+  String get tab_practices => '修持計畫';
+
   @override
   String get text_search => '搜尋';
 
diff --git a/lib/features/group_profile/presentation/widgets/group_profile_body.dart b/lib/features/group_profile/presentation/widgets/group_profile_body.dart
@@ -126,7 +126,10 @@ class _GroupProfileBodyState extends ConsumerState<GroupProfileBody>
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         if (!_isCommunityGroup(profile) && _hasBanner(profile)) ...[
-          _buildProfileBanner(profile, isDark),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 14),
+            child: _buildProfileBanner(profile, isDark),
+          ),
           const SizedBox(height: 16),
         ],
         _buildProfileHeader(profile, isDark, lineHeight),
@@ -347,7 +350,7 @@ class _GroupProfileBodyState extends ConsumerState<GroupProfileBody>
             fontWeight: FontWeight.w500,
           ),
           tabs: [
-            Tab(text: context.l10n.nav_practice),
+            Tab(text: context.l10n.tab_practices),
             Tab(text: membersTabLabel),
             if (hasAbout) Tab(text: context.l10n.about_title),
           ],
@@ -391,7 +394,7 @@ class _GroupProfileBodyState extends ConsumerState<GroupProfileBody>
     }
 
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
+      padding: const EdgeInsets.symmetric(horizontal: 2),
       child: ClipRRect(
         borderRadius: BorderRadius.circular(16),
         child: AspectRatio(
diff --git a/lib/features/group_profile/presentation/widgets/group_profile_members_tab.dart b/lib/features/group_profile/presentation/widgets/group_profile_members_tab.dart
@@ -227,8 +227,6 @@ class _GroupMemberRow extends StatelessWidget {
                           ? CachedNetworkImageWidget(
                             key: ValueKey(member.avatarUrl),
                             imageUrl: member.avatarUrl,
-                            width: 44,
-                            height: 44,
                             fit: BoxFit.cover,
                             errorWidget: _buildAvatarFallback(isDark),
                           )
diff --git a/lib/features/home/presentation/widgets/home_header.dart b/lib/features/home/presentation/widgets/home_header.dart
@@ -19,7 +19,9 @@ import 'package:go_router/go_router.dart';
 class HomeTabAppBar extends ConsumerWidget implements PreferredSizeWidget {
   const HomeTabAppBar({super.key});
 
-  static const double toolbarHeight = 58;
+  /// Tall enough for two-line Tibetan greetings without clipping ascenders.
+  static const double toolbarHeight = 70;
+  static const double tibetanGreetingTopPadding = 6;
   static const double _actionsReserveWidth = 148;
 
   @override
@@ -29,6 +31,8 @@ class HomeTabAppBar extends ConsumerWidget implements PreferredSizeWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final user = ref.watch(userProvider).user;
     final firstName = user?.firstName ?? user?.username;
+    final hasName = firstName?.isNotEmpty ?? false;
+    final isTibetanGreeting = context.isTibetanLocale && hasName;
 
     final streakCount = ref
         .watch(streakFutureProvider)
@@ -38,9 +42,11 @@ class HomeTabAppBar extends ConsumerWidget implements PreferredSizeWidget {
         );
 
     return MainTabAppBar(
-      toolbarHeight: HomeTabAppBar.toolbarHeight,
+      toolbarHeight: toolbarHeight,
       titleWidget: _Greeting(
         firstName: firstName,
+        toolbarHeight: toolbarHeight,
+        alignToBottom: isTibetanGreeting,
         maxWidth:
             MediaQuery.sizeOf(context).width -
             MainTabAppBar.titleSpacing -
@@ -91,21 +97,81 @@ class HomeEventBanner extends ConsumerWidget {
 }
 
 class _Greeting extends StatelessWidget {
-  const _Greeting({required this.firstName, required this.maxWidth});
+  const _Greeting({
+    required this.firstName,
+    required this.maxWidth,
+    required this.toolbarHeight,
+    this.alignToBottom = false,
+  });
 
   final String? firstName;
   final double maxWidth;
+  final double toolbarHeight;
+  final bool alignToBottom;
 
   Widget _buildLine({
     required BuildContext context,
     required String text,
     required TextStyle style,
     required double fontSize,
+    int maxLines = 1,
   }) {
     return Text.rich(
       TextSpan(text: text, style: style),
-      strutStyle: context.tibetanStrutStyle(fontSize),
+      strutStyle: context.tibetanStrutStyle(fontSize, compact: true),
       softWrap: true,
+      maxLines: maxLines,
+      overflow: TextOverflow.clip,
+    );
+  }
+
+  Widget _buildGreetingContent({
+    required BuildContext context,
+    required TextStyle greetingStyle,
+    required double greetingFontSize,
+    required String prefix,
+    required String helloPrefix,
+    required String? displayName,
+  }) {
+    final formattedName =
+        displayName != null
+            ? withDisplayLineBreakOpportunities(displayName)
+            : null;
+
+    if (context.isTibetanLocale) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          _buildLine(
+            context: context,
+            text: withTibetanLineBreakOpportunities(prefix),
+            style: greetingStyle,
+            fontSize: greetingFontSize,
+          ),
+          if (formattedName != null) ...[
+            const SizedBox(height: 2),
+            _buildLine(
+              context: context,
+              text: formattedName,
+              style: greetingStyle,
+              fontSize: greetingFontSize,
+            ),
+          ],
+        ],
+      );
+    }
+
+    final greeting =
+        formattedName != null ? '$helloPrefix$formattedName' : prefix;
+
+    return _buildLine(
+      context: context,
+      text: greeting,
+      style: greetingStyle,
+      fontSize: greetingFontSize,
+      maxLines: 2,
     );
   }
 
@@ -114,23 +180,36 @@ class _Greeting extends StatelessWidget {
     final localizations = AppLocalizations.of(context)!;
     final colorScheme = Theme.of(context).colorScheme;
     final greetingFontSize = getLocalizedFontSize(AppTextSize.titleLarge);
-    final greetingStyle = MainTabAppBar.titleStyle(context).copyWith(
-      color: colorScheme.onSurface,
-      height: getLineHeight(Localizations.localeOf(context).languageCode),
+    final greetingStyle = MainTabAppBar.titleStyle(
+      context,
+    ).copyWith(color: colorScheme.onSurface);
+    final helloPrefix = localizations.home_hello_prefix;
+    final prefix = helloPrefix.trim();
+    final displayName = firstName?.isNotEmpty == true ? firstName : null;
+
+    final greetingContent = _buildGreetingContent(
+      context: context,
+      greetingStyle: greetingStyle,
+      greetingFontSize: greetingFontSize,
+      prefix: prefix,
+      helloPrefix: helloPrefix,
+      displayName: displayName,
     );
-    final prefix = localizations.home_hello_prefix.trim();
-    final greeting =
-        firstName != null && firstName!.isNotEmpty
-            ? '${localizations.home_hello_prefix}$firstName'
-            : prefix;
 
     return SizedBox(
       width: maxWidth,
-      child: _buildLine(
-        context: context,
-        text: withTibetanLineBreakOpportunities(greeting),
-        style: greetingStyle,
-        fontSize: greetingFontSize,
+      height: toolbarHeight,
+      child: Align(
+        alignment: alignToBottom ? Alignment.bottomLeft : Alignment.centerLeft,
+        child: Padding(
+          padding: EdgeInsets.only(
+            top:
+                context.isTibetanLocale
+                    ? HomeTabAppBar.tibetanGreetingTopPadding
+                    : 0,
+          ),
+          child: greetingContent,
+        ),
       ),
     );
   }
diff --git a/lib/shared/utils/helper_functions.dart b/lib/shared/utils/helper_functions.dart
@@ -80,6 +80,25 @@ String withTibetanLineBreakOpportunities(String text) {
   );
 }
 
+final _whitespacePattern = RegExp(r'\s');
+
+/// Inserts zero-width break opportunities so Flutter can wrap [text] that has
+/// no whitespace (e.g. a long username).
+String withWordBreakOpportunities(String text, {int minLength = 12}) {
+  if (text.isEmpty ||
+      text.length < minLength ||
+      _whitespacePattern.hasMatch(text)) {
+    return text;
+  }
+
+  return text.split('').join('\u200B');
+}
+
+/// Applies Tibetan syllable and word-level break opportunities for constrained UI.
+String withDisplayLineBreakOpportunities(String text) {
+  return withWordBreakOpportunities(withTibetanLineBreakOpportunities(text));
+}
+
 /// Calculates the share position origin for share_plus ShareParams.
 ///
 /// Tries to get the position from the provided [context] or [globalKey].
diff --git a/lib/shared/widgets/main_tab_app_bar.dart b/lib/shared/widgets/main_tab_app_bar.dart
@@ -54,6 +54,7 @@ class MainTabAppBar extends StatelessWidget implements PreferredSizeWidget {
   @override
   Widget build(BuildContext context) {
     return AppBar(
+      clipBehavior: Clip.none,
       elevation: 0,
       scrolledUnderElevation: 0,
       automaticallyImplyLeading: false,
