bible-technology · vipinpaul · Jun 6, 2024 · May 29, 2024 · May 29, 2024 · May 29, 2024
diff --git a/renderer/src/components/AudioRecorder/components/ReferenceSelector.js b/renderer/src/components/AudioRecorder/components/ReferenceSelector.js
@@ -3,7 +3,9 @@ import PropTypes from 'prop-types';
 
 const AudioWaveform = dynamic(() => import('./WaveForm'), { ssr: false });
 
-export default function ReferenceSelector({ data, versepath, verse }) {
+export default function ReferenceSelector({
+ data, versepath, verse, font, fontSize,
+}) {
   const path = require('path');
   return (
     <div className="bg-white col-span-3 m-3 rounded-md shadow overflow-hidden">
@@ -21,7 +23,14 @@ export default function ReferenceSelector({ data, versepath, verse }) {
                   {story.verseNumber}
                 </div>
               </div>
-              <p className="text-sm text-gray-600 leading-relaxed">
+              <p
+                className="text-sm text-gray-600 leading-relaxed"
+                style={{
+                fontFamily: font || 'sans-serif',
+                fontSize: `${fontSize}rem`,
+                lineHeight: (fontSize > 1.3) ? 1.5 : '',
+              }}
+              >
                 {story.verseText}
               </p>
             </div>

diff --git a/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js b/renderer/src/components/EditorPage/AudioEditor/AudioEditor.js
@@ -31,7 +31,7 @@ const AudioEditor = ({ editor }) => {
       audioContent,
       audioPath,
       selectedFont,
-      fontSize,
+      editorFontSize,
       // eslint-disable-next-line no-unused-vars
       updateWave, // updateWave is used to update the waveform in the Editor after recording audio
     }, actions: {
@@ -219,7 +219,7 @@ const AudioEditor = ({ editor }) => {
         verse={verse}
         location={audioPath}
         updateWave={updateWave}
-        fontSize={fontSize}
+        fontSize={editorFontSize}
         selectedFont={selectedFont}
       />
 )}

diff --git a/renderer/src/components/EditorPage/ObsEditor/EditorPanel.js b/renderer/src/components/EditorPage/ObsEditor/EditorPanel.js
@@ -8,12 +8,13 @@ const EditorPanel = ({ obsStory, storyUpdate }) => {
   const {
     state: {
       selectedFont,
-      fontSize,
+      editorFontSize,
     },
     actions: {
       setSelectedStory,
     },
 } = useContext(ReferenceContext);
+
   const { states: { scrollLock } } = useContext(ProjectContext);
   const { t } = useTranslation();
   const handleChange = (e) => {
@@ -90,7 +91,7 @@ const EditorPanel = ({ obsStory, storyUpdate }) => {
               className="flex-grow text-justify ml-2 p-2 text-xl"
               style={{
                 fontFamily: selectedFont || 'sans-serif',
-                fontSize: `${fontSize}rem`,
+                fontSize: `${editorFontSize}rem`,
               }}
             />
           </div>
@@ -118,8 +119,8 @@ const EditorPanel = ({ obsStory, storyUpdate }) => {
               onInput={(e) => handleAutoHeight(e)}
               style={{
                 fontFamily: selectedFont || 'sans-serif',
-                fontSize: `${fontSize}rem`,
-                lineHeight: (fontSize > 1.3) ? 1.5 : '',
+                fontSize: `${editorFontSize}rem`,
+                lineHeight: (editorFontSize > 1.3) ? 1.5 : '',
               }}
             />
           </div>
@@ -140,8 +141,8 @@ const EditorPanel = ({ obsStory, storyUpdate }) => {
               className="flex-grow text-justify ml-2 p-2 text-sm"
               style={{
                 fontFamily: selectedFont || 'sans-serif',
-                fontSize: `${fontSize}rem`,
-                lineHeight: (fontSize > 1.3) ? 1.5 : '',
+                fontSize: `${editorFontSize}rem`,
+                lineHeight: (editorFontSize > 1.3) ? 1.5 : '',
               }}
             />
           </div>

diff --git a/renderer/src/components/EditorPage/ObsEditor/ObsEditor.js b/renderer/src/components/EditorPage/ObsEditor/ObsEditor.js
@@ -19,7 +19,11 @@ import { getDetails } from './utils/getDetails';
 const ObsEditor = () => {
   const [mdData, setMdData] = useState();
   const [directoryName, setDirectoryName] = useState();
-  const { state: { obsNavigation, loadData }, actions: { setLoadData } } = useContext(ReferenceContext);
+  const {
+ state: {
+ obsNavigation, loadData,
+}, actions: { setLoadData },
+} = useContext(ReferenceContext);
 
   const updateStory = (story) => {
     logger.debug('ObsEditor.js', 'In updateStory for upadting the story to the backend md file');
@@ -89,6 +93,7 @@ const ObsEditor = () => {
                         );
                         localforage.setItem('projectmeta', value);
                         // This func will update the scribe-setting.json file
+                        // saveReferenceResource(selectedFont, editorFontSize);
                         saveReferenceResource();
                       });
                     });

diff --git a/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js b/renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js
@@ -18,14 +18,15 @@ const style = {
     fontStyle: 'italic',
   },
 };
-const ReferenceObs = ({ stories, font, title }) => {
+const ReferenceObs = ({
+ stories, font, title, fontSize,
+}) => {
   const [isLoading, setIsLoading] = useState(true);
   const [direction, setDirection] = useState('ltr');
   const [networkState, setNetworkState] = useState({ online: true });
   const {
  state: {
     selectedStory,
-    fontSize,
   },
   actions: {
     setSelectedStory,

diff --git a/renderer/src/components/EditorPage/ObsEditor/WebReferenceObs.js b/renderer/src/components/EditorPage/ObsEditor/WebReferenceObs.js
@@ -26,7 +26,7 @@ const ReferenceObs = ({ stories }) => {
  state: {
     selectedStory,
     selectedFont,
-    fontSize,
+    fontSize1: fontSize,
   },
   actions: {
     setSelectedStory,

diff --git a/renderer/src/components/EditorPage/Reference/Audio/ReferenceAudio.js b/renderer/src/components/EditorPage/Reference/Audio/ReferenceAudio.js
@@ -25,6 +25,8 @@ const ReferenceAudio = ({
   chapter,
   verse,
   bookId,
+  font,
+  fontSize,
 }) => {
   const {
     actions: {
@@ -227,6 +229,8 @@ const ReferenceAudio = ({
               data={bookData}
               versepath={mp3Path}
               verse={verse}
+              font={font}
+              fontSize={fontSize}
             //   goToVerse={{
             //     chapter: parseInt(chapter, 10),
             //     verse: parseInt(verse, 10),

diff --git a/renderer/src/components/EditorPage/Reference/OBS/ObsResourceCard.js b/renderer/src/components/EditorPage/Reference/OBS/ObsResourceCard.js
@@ -17,6 +17,7 @@ function ObsResourceCard({
   isLoading,
   setIndex,
   font,
+  fontSize,
 }) {
   const {
     state: { filters, markdownView },
@@ -36,7 +37,12 @@ function ObsResourceCard({
         itemIndex={index}
         setItemIndex={setIndex}
       />
-      <div style={{ fontFamily: font || 'sans-serif' }}>
+      <div style={{
+          fontFamily: font || 'sans-serif',
+          fontSize: `${fontSize}rem`,
+          lineHeight: (fontSize > 1.3) ? 1.5 : '',
+        }}
+      >
         <CardContent
           item={[]}
           items={items}

diff --git a/renderer/src/components/EditorPage/Reference/OBS/ObsTn.js b/renderer/src/components/EditorPage/Reference/OBS/ObsTn.js
@@ -27,6 +27,7 @@ function ObsTnCard({
   resourceId,
   offlineResource,
   font,
+  fontSize,
   ...props
 }) {
   const [index, setIndex] = useState(0);
@@ -143,6 +144,7 @@ function ObsTnCard({
         index={index}
         setIndex={(v) => setIndex(v)}
         font={font}
+        fontSize={fontSize}
       />
     ) : <LoadingScreen />
   );

diff --git a/renderer/src/components/EditorPage/Reference/OBS/ObsTwlCard.js b/renderer/src/components/EditorPage/Reference/OBS/ObsTwlCard.js
@@ -23,6 +23,7 @@ function ObsTwlCard({
   resourceId,
   offlineResource,
   font,
+  fontSize,
   ...props
 }) {
   const [index, setIndex] = useState(1);
@@ -104,6 +105,7 @@ function ObsTwlCard({
         index={index}
         setIndex={(v) => setIndex(v)}
         font={font}
+        fontSize={fontSize}
       />
     ) : (
       <LoadingScreen />

diff --git a/renderer/src/components/EditorPage/Reference/ReferenceBible/ReferenceBibleX.js b/renderer/src/components/EditorPage/Reference/ReferenceBible/ReferenceBibleX.js
@@ -13,6 +13,7 @@ const ReferenceBibleX = ({
   refName,
   bookId,
   font,
+  fontSize,
 }) => {
   const {
     states: {
@@ -47,6 +48,7 @@ const ReferenceBibleX = ({
     refName,
     scrollLock,
     font,
+    fontSize,
   };
   return (
     <>

diff --git a/renderer/src/components/EditorPage/Reference/ReferenceCard.js b/renderer/src/components/EditorPage/Reference/ReferenceCard.js
@@ -15,6 +15,7 @@ const ReferenceCard = ({
   font,
   setResetTrigger,
   resetTrigger,
+  fontSize,
 }) => {
   const {
     state: {
@@ -43,7 +44,12 @@ const ReferenceCard = ({
         setItemIndex={setItemIndex}
       />
     )}
-      <div style={{ fontFamily: font || 'sans-serif' }}>
+      <div style={{
+          fontFamily: font || 'sans-serif',
+          fontSize: `${fontSize}rem`,
+          lineHeight: (fontSize > 1.3) ? 1.5 : '',
+        }}
+      >
         <CardContent
           item={item}
           items={items}

diff --git a/renderer/src/components/EditorPage/Reference/TranslationHelps.js b/renderer/src/components/EditorPage/Reference/TranslationHelps.js
@@ -7,7 +7,7 @@ import ObsTnCard from './OBS/ObsTn';
 import ObsTwlCard from './OBS/ObsTwlCard';
 
 const TranslationHelps = ({
- selectedResource, languageId, refName, bookId, chapter, verse, owner, story, offlineResource, font,
+ selectedResource, languageId, refName, bookId, chapter, verse, owner, story, offlineResource, font, fontSize,
 }) => {
   const {
     state: {
@@ -40,6 +40,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'twl':
@@ -56,6 +57,7 @@ const TranslationHelps = ({
               owner="test_org"
               server="https://git.door43.org"
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'twlm':
@@ -72,6 +74,7 @@ const TranslationHelps = ({
               owner={owner}
               server="https://git.door43.org"
               font={font}
+              fontSize={fontSize}
             />
             );
         case 'tq':
@@ -90,6 +93,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'tw':
@@ -106,6 +110,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
             );
         case 'ta':
@@ -123,6 +128,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
             );
         case 'bible':
@@ -135,6 +141,7 @@ const TranslationHelps = ({
               chapter={chapter}
               verse={verse}
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'obs':
@@ -147,6 +154,7 @@ const TranslationHelps = ({
               chapter={chapter}
               verse={verse}
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'obs-tn':
@@ -163,6 +171,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
           );
         case 'obs-tq':
@@ -179,6 +188,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
           );
           case 'obs-twlm':
@@ -195,6 +205,7 @@ const TranslationHelps = ({
               server="https://git.door43.org"
               offlineResource={offlineResource}
               font={font}
+              fontSize={fontSize}
             />
           );
         default:

diff --git a/renderer/src/components/EditorPage/Reference/TranslationHelpsCard.js b/renderer/src/components/EditorPage/Reference/TranslationHelpsCard.js
@@ -32,6 +32,7 @@ export default function TranslationHelpsCard({
   viewMode,
   offlineResource,
   font,
+  fontSize,
 }) {
   const [offlineItems, setOfflineItems] = useState([]);
   const [offlineItemsDisable, setOfflineItemsDisable] = useState(false);
@@ -271,6 +272,7 @@ export default function TranslationHelpsCard({
           selectedQuote={selectedQuote}
           setQuote={setQuote}
           font={font}
+          fontSize={fontSize}
           setResetTrigger={setResetTrigger}
           resetTrigger={resetTrigger}
         />

diff --git a/renderer/src/components/EditorPage/TextEditor/Editor.jsx b/renderer/src/components/EditorPage/TextEditor/Editor.jsx
@@ -39,7 +39,7 @@ export default function Editor(props) {
 
   const {
     state: {
-      chapter, selectedFont, fontSize, projectScriptureDir,
+      chapter, selectedFont, editorFontSize, projectScriptureDir,
     },
   } = useContext(ReferenceContext);
 
@@ -166,8 +166,8 @@ export default function Editor(props) {
       id="fulleditor"
       style={{
         fontFamily: selectedFont || 'sans-serif',
-        fontSize: `${fontSize}rem`,
-        lineHeight: (fontSize > 1.3) ? 1.5 : '',
+        fontSize: `${editorFontSize}rem`,
+        lineHeight: (editorFontSize > 1.3) ? 1.5 : '',
         direction: `${projectScriptureDir === 'RTL' ? 'rtl' : 'auto'}`,
       }}
       className="border-l-2 border-r-2 border-secondary pb-16 overflow-auto h-full scrollbars-width leading-8"