Merge pull request #49 from OpenPecha/develop

updated db
OpenPecha · Nov 29, 2024 · 505248a · 505248a
2 parents 7a5da61 + 0b665e1
commit 505248a
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 20 deletions.
diff --git a/assets/db/gonpa.db b/assets/db/gonpa.db
diff --git a/lib/models/deity_model.dart b/lib/models/deity_model.dart
@@ -9,7 +9,9 @@ class Deity {
   final String? callNumber;
   final String? slug;
   final String? pic;
-  final String? sound;
+  final String? tbsound;
+  final String? ensound;
+
   final DateTime created;
   final DateTime updated;
 
@@ -24,7 +26,8 @@ class Deity {
     this.callNumber,
     this.slug,
     this.pic,
-    this.sound,
+    this.tbsound,
+    this.ensound,
     required this.created,
     required this.updated,
   });
@@ -41,7 +44,8 @@ class Deity {
       callNumber: map['callnumber'] as String?,
       slug: map['slug'] as String?,
       pic: map['pic'] as String?,
-      sound: map['sound'] as String?,
+      tbsound: map['tbsound'] as String?,
+      ensound: map['ensound'] as String?,
       created: DateTime.parse(map['created'] as String),
       updated: DateTime.parse(map['updated'] as String),
     );
@@ -59,7 +63,8 @@ class Deity {
       'callnumber': callNumber,
       'slug': slug,
       'pic': pic,
-      'sound': sound,
+      'tbsound': tbsound,
+      'ensound': ensound,
       'created': created.toIso8601String(),
       'updated': updated.toIso8601String(),
     };
@@ -76,7 +81,8 @@ class Deity {
     String? callNumber,
     String? slug,
     String? pic,
-    String? sound,
+    String? tbsound,
+    String? ensound,
     DateTime? created,
     DateTime? updated,
   }) {
@@ -91,7 +97,8 @@ class Deity {
       callNumber: callNumber ?? this.callNumber,
       slug: slug ?? this.slug,
       pic: pic ?? this.pic,
-      sound: sound ?? this.sound,
+      tbsound: tbsound ?? this.tbsound,
+      ensound: ensound ?? this.ensound,
       created: created ?? this.created,
       updated: updated ?? this.updated,
     );

diff --git a/lib/models/organization_model.dart b/lib/models/organization_model.dart
@@ -20,7 +20,8 @@ class Organization {
   final String callNumber;
   final String slug;
   final String pic;
-  final String? sound;
+  final String? tbsound;
+  final String? ensound;
   final DateTime created;
   final DateTime updated;
 
@@ -46,7 +47,8 @@ class Organization {
     required this.callNumber,
     required this.slug,
     required this.pic,
-    this.sound,
+    this.tbsound,
+    this.ensound,
     required this.created,
     required this.updated,
   });
@@ -74,7 +76,8 @@ class Organization {
       callNumber: map['callnumber'] as String,
       slug: map['slug'] as String,
       pic: map['pic'] as String,
-      sound: map['sound'] as String?,
+      tbsound: map['tbsound'] as String?,
+      ensound: map['ensound'] as String?,
       created: DateTime.parse(map['created'] as String),
       updated: DateTime.parse(map['updated'] as String),
     );
@@ -102,7 +105,8 @@ class Organization {
       'callnumber': callNumber,
       'slug': slug,
       'pic': pic,
-      'sound': sound,
+      'tbsound': tbsound,
+      'ensound': ensound,
       'created': created.toIso8601String(),
       'updated': updated.toIso8601String(),
     };
@@ -131,7 +135,8 @@ class Organization {
     String? callNumber,
     String? slug,
     String? pic,
-    String? sound,
+    String? tbsound,
+    String? ensound,
     DateTime? created,
     DateTime? updated,
   }) {
@@ -157,7 +162,8 @@ class Organization {
       callNumber: callNumber ?? this.callNumber,
       slug: slug ?? this.slug,
       pic: pic ?? this.pic,
-      sound: sound ?? this.sound,
+      tbsound: tbsound ?? this.tbsound,
+      ensound: ensound ?? this.ensound,
       created: created ?? this.created,
       updated: updated ?? this.updated,
     );

diff --git a/lib/ui/screen/deities_detail_screen.dart b/lib/ui/screen/deities_detail_screen.dart
@@ -59,9 +59,11 @@ class DeityDetailScreen extends ConsumerWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              if (selectedDeity.sound != null)
+              if (selectedDeity.tbsound != null)
                 SpeakerWidget(
-                    audioUrl: selectedDeity.sound!,
+                    audioUrl: context.localizedText(
+                        enText: selectedDeity.ensound ?? '',
+                        boText: selectedDeity.tbsound ?? ''),
                     description: selectedDeity.enContent),
               const SizedBox(height: 16),
               Text(

diff --git a/lib/ui/screen/organization_detail_screen.dart b/lib/ui/screen/organization_detail_screen.dart
@@ -60,9 +60,11 @@ class OrganizationDetailScreen extends ConsumerWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              if (selectedOrganization.sound != null)
+              if (selectedOrganization.tbsound != null)
                 SpeakerWidget(
-                    audioUrl: selectedOrganization.sound!,
+                    audioUrl: context.localizedText(
+                        enText: selectedOrganization.ensound ?? '',
+                        boText: selectedOrganization.tbsound ?? ''),
                     description: context.localizedText(
                         enText: selectedOrganization.enContent,
                         boText: selectedOrganization.tbContent)),

diff --git a/lib/ui/widget/speaker_widget.dart b/lib/ui/widget/speaker_widget.dart
@@ -17,9 +17,13 @@ class SpeakerWidget extends ConsumerWidget {
     final LanguageState currentLanguage = ref.watch(languageProvider);
 
     return currentLanguage.currentLanguage == "en"
-        ? FlutterTtsSpeaker(
-            text: description,
-          )
-        : AudioPlayerWidget(audioUrl: audioUrl);
+        ? (audioUrl.isEmpty
+            ? FlutterTtsSpeaker(
+                text: description,
+              )
+            : AudioPlayerWidget(audioUrl: audioUrl))
+        : audioUrl.isEmpty
+            ? SizedBox()
+            : AudioPlayerWidget(audioUrl: audioUrl);
   }
 }