Skip to content

Commit 9d9d454

Browse files
tentamdintentamdin
authored
Merge pull request #457 from OpenPecha/calaenddr-fix
fix: Calendar fix and some bug
2 parents 0fedca8 + 053406c commit 9d9d454

33 files changed

Lines changed: 1263 additions & 259 deletions

‎assets/images/buddha.jpeg‎

7.94 MB
Loading

‎lib/core/config/router/app_router.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ final appRouterProvider = Provider<GoRouter>((ref) {
224224
GoRoute(
225225
path: "group/:groupId",
226226
name: "home-group-profile",
227+
parentNavigatorKey: rootNavigatorKey,
227228
builder: (context, state) {
228229
final groupId = state.pathParameters['groupId'] ?? '';
229230
return GroupProfileScreen(groupId: groupId);

‎lib/core/constants/app_assets.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class AppAssets {
1414
static const String recitationCoverDefault =
1515
'assets/images/recitation_cover/recitation_05.jpg';
1616
static const String connect = 'assets/images/connect.png';
17+
static const String verseOfDayFallback = 'assets/images/buddha.jpeg';
1718

1819
// ========== AUDIO ==========
1920
static const String meditationSound = 'assets/audios/meditation.mp3';

‎lib/core/l10n/app_bo.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,29 @@
676676
"joined": "ཞུགས་ཟིན།",
677677
"group_member": "ཚོགས་མི།",
678678
"group_members": "ཚོགས་མི།",
679+
"group_tab_members": "ཚོགས་མི།",
680+
"group_tab_followers": "རྗེས་འབྲང་པ།",
681+
"group_members_heading": "ཚོགས་མི({count})",
682+
"group_followers_heading": "རྗེས་འབྲང་པ({count})",
683+
"@group_members_heading": {
684+
"placeholders": {
685+
"count": {
686+
"type": "int"
687+
}
688+
}
689+
},
690+
"@group_followers_heading": {
691+
"placeholders": {
692+
"count": {
693+
"type": "int"
694+
}
695+
}
696+
},
697+
"group_invite": "སྐུ་འཕྲིན།",
698+
"group_members_load_error": "ཚོགས་མི་མངག་ཐུབ་མ་སོང་། ཡང་བསྐྱར་ཚོད་ལྟ་གནང་རོགས།",
699+
"group_followers_load_error": "རྗེས་འབྲང་པ་མངག་ཐུབ་མ་སོང་། ཡང་བསྐྱར་ཚོད་ལྟ་གནང་རོགས།",
700+
"group_members_empty": "ཚོགས་མི་མེད།",
701+
"group_followers_empty": "རྗེས་འབྲང་པ་མེད།",
679702
"group_follower": "རྗེས་འབྲང་པ།",
680703
"group_followers": "རྗེས་འབྲང་པ།",
681704
"group_links_title": "འབྲེལ་ཐག",

‎lib/core/l10n/app_en.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,29 @@
753753
"joined": "Joined",
754754
"group_member": "member",
755755
"group_members": "members",
756+
"group_tab_members": "Members",
757+
"group_tab_followers": "Followers",
758+
"group_members_heading": "Members({count})",
759+
"group_followers_heading": "Followers({count})",
760+
"@group_members_heading": {
761+
"placeholders": {
762+
"count": {
763+
"type": "int"
764+
}
765+
}
766+
},
767+
"@group_followers_heading": {
768+
"placeholders": {
769+
"count": {
770+
"type": "int"
771+
}
772+
}
773+
},
774+
"group_invite": "Invite",
775+
"group_members_load_error": "Unable to load members. Please try again.",
776+
"group_followers_load_error": "Unable to load followers. Please try again.",
777+
"group_members_empty": "No members yet",
778+
"group_followers_empty": "No followers yet",
756779
"group_follower": "follower",
757780
"group_followers": "followers",
758781
"group_links_title": "Links",

‎lib/core/l10n/app_hi.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,29 @@
742742
"joined": "शामिल हो गए",
743743
"group_member": "सदस्य",
744744
"group_members": "सदस्य",
745+
"group_tab_members": "सदस्य",
746+
"group_tab_followers": "अनुयायी",
747+
"group_members_heading": "सदस्य({count})",
748+
"group_followers_heading": "अनुयायी({count})",
749+
"@group_members_heading": {
750+
"placeholders": {
751+
"count": {
752+
"type": "int"
753+
}
754+
}
755+
},
756+
"@group_followers_heading": {
757+
"placeholders": {
758+
"count": {
759+
"type": "int"
760+
}
761+
}
762+
},
763+
"group_invite": "आमंत्रित करें",
764+
"group_members_load_error": "सदस्य लोड नहीं हो सके। कृपया पुनः प्रयास करें।",
765+
"group_followers_load_error": "अनुयायी लोड नहीं हो सके। कृपया पुनः प्रयास करें।",
766+
"group_members_empty": "अभी कोई सदस्य नहीं",
767+
"group_followers_empty": "अभी कोई अनुयायी नहीं",
745768
"group_follower": "अनुयायी",
746769
"group_followers": "अनुयायी",
747770
"group_links_title": "लिंक",

‎lib/core/l10n/app_mn.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,29 @@
742742
"joined": "Нэгдсэн",
743743
"group_member": "гишүүн",
744744
"group_members": "гишүүд",
745+
"group_tab_members": "Гишүүд",
746+
"group_tab_followers": "Дагагчид",
747+
"group_members_heading": "Гишүүд({count})",
748+
"group_followers_heading": "Дагагчид({count})",
749+
"@group_members_heading": {
750+
"placeholders": {
751+
"count": {
752+
"type": "int"
753+
}
754+
}
755+
},
756+
"@group_followers_heading": {
757+
"placeholders": {
758+
"count": {
759+
"type": "int"
760+
}
761+
}
762+
},
763+
"group_invite": "Урих",
764+
"group_members_load_error": "Гишүүдийг ачаалж чадсангүй. Дахин оролдоно уу.",
765+
"group_followers_load_error": "Дагагчдыг ачаалж чадсангүй. Дахин оролдоно уу.",
766+
"group_members_empty": "Одоогоор гишүүн байхгүй",
767+
"group_followers_empty": "Одоогоор дагагч байхгүй",
745768
"group_follower": "дагагч",
746769
"group_followers": "дагагчид",
747770
"group_links_title": "Холбоосууд",

‎lib/core/l10n/app_ne.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,29 @@
742742
"joined": "सामेल भयो",
743743
"group_member": "सदस्य",
744744
"group_members": "सदस्यहरू",
745+
"group_tab_members": "सदस्यहरू",
746+
"group_tab_followers": "अनुयायीहरू",
747+
"group_members_heading": "सदस्यहरू({count})",
748+
"group_followers_heading": "अनुयायीहरू({count})",
749+
"@group_members_heading": {
750+
"placeholders": {
751+
"count": {
752+
"type": "int"
753+
}
754+
}
755+
},
756+
"@group_followers_heading": {
757+
"placeholders": {
758+
"count": {
759+
"type": "int"
760+
}
761+
}
762+
},
763+
"group_invite": "निमन्त्रणा",
764+
"group_members_load_error": "सदस्यहरू लोड गर्न सकिएन। कृपया पुनः प्रयास गर्नुहोस्।",
765+
"group_followers_load_error": "अनुयायीहरू लोड गर्न सकिएन। कृपया पुनः प्रयास गर्नुहोस्।",
766+
"group_members_empty": "अहिलेसम्म कुनै सदस्य छैन",
767+
"group_followers_empty": "अहिलेसम्म कुनै अनुयायी छैन",
745768
"group_follower": "अनुयायी",
746769
"group_followers": "अनुयायीहरू",
747770
"group_links_title": "लिङ्कहरू",

‎lib/core/l10n/app_zh.arb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,29 @@
676676
"joined": "已加入",
677677
"group_member": "位成員",
678678
"group_members": "位成員",
679+
"group_tab_members": "成員",
680+
"group_tab_followers": "追蹤者",
681+
"group_members_heading": "成員({count})",
682+
"group_followers_heading": "追蹤者({count})",
683+
"@group_members_heading": {
684+
"placeholders": {
685+
"count": {
686+
"type": "int"
687+
}
688+
}
689+
},
690+
"@group_followers_heading": {
691+
"placeholders": {
692+
"count": {
693+
"type": "int"
694+
}
695+
}
696+
},
697+
"group_invite": "邀請",
698+
"group_members_load_error": "無法載入成員，請再試一次。",
699+
"group_followers_load_error": "無法載入追蹤者，請再試一次。",
700+
"group_members_empty": "尚無成員",
701+
"group_followers_empty": "尚無追蹤者",
679702
"group_follower": "位追蹤者",
680703
"group_followers": "位追蹤者",
681704
"group_links_title": "連結",

‎lib/core/l10n/generated/app_localizations.dart‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2848,6 +2848,60 @@ abstract class AppLocalizations {
28482848
/// **'members'**
28492849
String get group_members;
28502850

2851+
/// No description provided for @group_tab_members.
2852+
///
2853+
/// In en, this message translates to:
2854+
/// **'Members'**
2855+
String get group_tab_members;
2856+
2857+
/// No description provided for @group_tab_followers.
2858+
///
2859+
/// In en, this message translates to:
2860+
/// **'Followers'**
2861+
String get group_tab_followers;
2862+
2863+
/// No description provided for @group_members_heading.
2864+
///
2865+
/// In en, this message translates to:
2866+
/// **'Members({count})'**
2867+
String group_members_heading(int count);
2868+
2869+
/// No description provided for @group_followers_heading.
2870+
///
2871+
/// In en, this message translates to:
2872+
/// **'Followers({count})'**
2873+
String group_followers_heading(int count);
2874+
2875+
/// No description provided for @group_invite.
2876+
///
2877+
/// In en, this message translates to:
2878+
/// **'Invite'**
2879+
String get group_invite;
2880+
2881+
/// No description provided for @group_members_load_error.
2882+
///
2883+
/// In en, this message translates to:
2884+
/// **'Unable to load members. Please try again.'**
2885+
String get group_members_load_error;
2886+
2887+
/// No description provided for @group_followers_load_error.
2888+
///
2889+
/// In en, this message translates to:
2890+
/// **'Unable to load followers. Please try again.'**
2891+
String get group_followers_load_error;
2892+
2893+
/// No description provided for @group_members_empty.
2894+
///
2895+
/// In en, this message translates to:
2896+
/// **'No members yet'**
2897+
String get group_members_empty;
2898+
2899+
/// No description provided for @group_followers_empty.
2900+
///
2901+
/// In en, this message translates to:
2902+
/// **'No followers yet'**
2903+
String get group_followers_empty;
2904+
28512905
/// No description provided for @group_follower.
28522906
///
28532907
/// In en, this message translates to:

0 commit comments

Comments
 (0)