Merge pull request #1886 from Gauravjeetsingh/9.2.0-fixes

Fix margin and other issues

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## New Updates
 
-### 9.2.0 - ਊਨਾ Release _December 25, 2023_
+### 9.2.0 - ਊਨਾ Release _January 12, 2024_
 
 #### New Features
 

www/configs/themes.json

@@ -181,7 +181,7 @@
     "transliteration-color": "#f1f5f4",
     "teeka-color": "#d1dbe2",
     "type": ["VIDEO"],
-    "background-video": "assets/videos/melancholy.mov",
+    "background-video": "assets/videos/melancholy.mp4",
     "key": "melancholy"
   }
 ]

www/locales/en.json

@@ -87,7 +87,7 @@
     "DOWNLOADING": "Downloading database..."
   },
   "INSERT": {
-    "ADD_ANNOUNCEMENT": "Add Announcement",
+    "ADD_ANNOUNCEMENT": "Display Announcement",
     "ADD_ANNOUNCEMENT_SLIDE": "Add Announcement Slide",
     "ADD_ANNOUNCEMENT_TEXT": "Announcement goes here...",
     "ADD_ANNOUNCEMENT_TEXT_GURMUKHI": "GoSxw ie`Qy ilKo...",

www/main/navigator/misc/components/favoritePane.jsx

@@ -99,8 +99,8 @@ export const FavoritePane = ({ className }) => {
         setHomeVerse(verseId);
       }
 
-      if (versesRead !== []) {
-        setVersesRead([]);
+      if (!versesRead.includes(verseId)) {
+        setVersesRead([verseId]);
       }
 
       if (isSundarGutkaBani) {

www/main/settings/components/ThemeContainer.jsx

@@ -19,7 +19,7 @@ const themeTypes = [
   { type: 'COLOR', title: 'COLORS' },
   { type: 'BACKGROUND', title: 'BACKGROUNDS' },
   { type: 'SPECIAL', title: 'SPECIAL_CONDITIONS' },
-  { type: 'VIDEO', title: 'VIDEOS'},
+  { type: 'VIDEO', title: 'VIDEOS' },
 ];
 
 const ThemeContainer = () => {
@@ -37,7 +37,12 @@ const ThemeContainer = () => {
       <div id="custom-theme-options">
         {themeTypes.map(({ type, title }) => (
           <React.Fragment key={type}>
-            <header className="options-header">{i18n.t(`THEMES.${title}`)}</header>
+            <header className="options-header">
+              {i18n.t(`THEMES.${title}`)}
+              {type === 'VIDEO' && (
+                <span className="notes">{i18n.t('SETTINGS.CHROMECAST_UNAVAILABLE')}</span>
+              )}
+            </header>
             <span className="theme-tile-holder">
               {groupThemes(type).map((theme) => (
                 <Tile
@@ -47,20 +52,23 @@ const ThemeContainer = () => {
                       applyTheme(theme, false, setTheme, setThemeBg, themeBg);
                     }
                   }}
-                  className={theme['background-video'] ? "video-theme-instance" : "theme-instance"}
+                  className={theme['background-video'] ? 'video-theme-instance' : 'theme-instance'}
                   theme={theme}
                 >
-                  { theme['background-video'] ?
-                    <VideoWithOverlay src={theme['background-video']} overlayContent={i18n.t(`THEMES.${theme.name}`)} />
-                    :
+                  {theme['background-video'] ? (
+                    <VideoWithOverlay
+                      src={theme['background-video']}
+                      overlayContent={i18n.t(`THEMES.${theme.name}`)}
+                    />
+                  ) : (
                     i18n.t(`THEMES.${theme.name}`)
-                  }
+                  )}
                 </Tile>
               ))}
             </span>
           </React.Fragment>
         ))}
-       
+
         <header className="options-header">{i18n.t(`THEMES.CUSTOM_BACKGROUNDS`)}</header>
         <label className="file-input-label">
           {i18n.t('THEMES.NEW_IMAGE')}

www/main/viewer/utils/chromecast.js

@@ -30,7 +30,7 @@ const displayError = (errorMessage) => {
     closeMethods: ['overlay', 'button', 'escape'],
   });
 
-  modal.setContent(`<h2>${errorMessage}</h2>`);
+  modal.setContent(`<h2 class='tingle-heading'>${errorMessage}</h2>`);
   // add ok button
   modal.addFooterBtn('OK', 'tingle-btn tingle-btn--pull-right tingle-btn--default', () => {
     modal.close();

www/main/viewer/viewerApp.jsx

@@ -24,7 +24,7 @@ const ViewerApp = () => {
         receivers.forEach((receiver) => {
           const fullName = receiver.service_fullname;
           const blacklist = ['Chromecast-Audio', 'Google-Home', 'Sound-Bar', 'Google-Cast-Group'];
-          if (!new RegExp(blacklist.join('|')).test(fullName)) {
+          if (receiver.friendlyName && !new RegExp(blacklist.join('|')).test(fullName)) {
             modal.addCastBtn(
               receiver.friendlyName,
               'tingle-btn tingle-btn--primary',
@@ -46,7 +46,7 @@ const ViewerApp = () => {
           receivers.length === 0
             ? i18n.t(`CHROMECAST.NO_DEVICES_FOUND`)
             : i18n.t('CHROMECAST.SELECT_DEVICE');
-        modal.setContent(`<h2>${message}</h2>`);
+        modal.setContent(`<h2 class='tingle-heading'>${message}</h2>`);
         // add cancel button
         const cancelTitle = receivers.length === 0 ? 'OK' : i18n.t('CHROMECAST.CANCEL');
         modal.addFooterBtn(

www/src/scss/_notifications.scss

@@ -2,6 +2,12 @@
   z-index: 1400;
 }
 
+.tingle-modal-box__content {
+  .tingle-heading {
+    color: white;
+  }
+}
+
 .sync-code-modal {
   .tingle-modal-box__content {
     color: #000;

www/src/scss/_settings.scss

@@ -186,14 +186,6 @@
           font-size: 18px;
         }
 
-        .notes {
-          color: #999;
-          flex-grow: 1;
-          font-size: 0.8em;
-          font-style: italic;
-          margin-left: 3px;
-        }
-
         .custom-checkbox {
           input[type='checkbox'] {
             left: -9999px;
@@ -232,6 +224,14 @@
   }
 }
 
+.notes {
+  color: #999;
+  flex-grow: 1;
+  font-size: 0.8em;
+  font-style: italic;
+  margin-left: 3px;
+}
+
 .settings-preview-title {
   padding: 4px;
 }