Merge pull request #527 from smartdevicelink/release/0.13.0

Release 0.13.0
smartdevicelink · Oct 26, 2022 · 65f7c27 · 65f7c27
2 parents 6a497d6 + 7035405
commit 65f7c27
Show file tree

Hide file tree

Showing 19 changed files with 112 additions and 56 deletions.
diff --git a/src/css/components/_app-services-nav.scss b/src/css/components/_app-services-nav.scss
@@ -205,45 +205,51 @@
 .app-service-nav-card {
   border-bottom: 1px solid #49C7ED;
   .svg-size {
-    @include size(100px);
-    min-width: 100px;
+    @include size(70px);
+    min-width: 70px;
     display: flex;
     justify-content: center;
     align-items: center;
+    border-radius: 10px;
     svg {
-      @include size(75px);
+      padding: 10px;
     }    
   }
 
   .app-service-icon {
-    @include size(100px);
-    min-width: 100px;
+    @include size(70px);
+    min-width: 70px;
     display: flex;
     justify-content: center;
     align-items: center;
+    border-radius: 10px;
     img {
-      @include size(75px);
+      @include size(50px);
     }    
   }
+
+  .nav-color {
+    background-color: #006600;
+  }
 }
 
 .app-service-media-card {
   border-bottom: 1px solid #49C7ED;
   .svg-size {
-    @include size(100px);
-    min-width: 100px;
+    @include size(70px);
+    min-width: 70px;
     display: flex;
     justify-content: center;
     align-items: center;
     border-radius: 10px;
     svg {
-      @include size(65px);      
+      padding: 10px;
     }    
   }
 
   .app-service-icon {
-    @include size(100px);
-    min-width: 100px;
+    @include size(70px);
+    min-width: 70px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -274,7 +280,7 @@
     align-items: center;
     border-radius: 10px;
     svg {
-      @include size(50px);      
+      padding: 10px;
     }    
   }
 

diff --git a/src/css/components/_control-bar.scss b/src/css/components/_control-bar.scss
@@ -26,6 +26,7 @@
             @include size(75px);
             display: flex;
             align-items: center;
+            justify-content: center;
             img {
                 max-width: 100%;
             }

diff --git a/src/css/components/_double-graphic-with-softbuttons.scss b/src/css/components/_double-graphic-with-softbuttons.scss
@@ -26,6 +26,7 @@
     height:100%;
     max-height: 100%;
     max-width: 100%;
+    padding: 10px;
     object-fit: contain;
     display: flex;
 }
@@ -58,8 +59,10 @@
     padding: 5px;
 }
 
-.double-graphic-with-softbuttons-template .soft-button .soft-button-image-static {
-    padding: 5px;
+.double-graphic-with-softbuttons-template .soft-button .soft-button-image {
+    max-width: 75px;
+    display: flex;
+    align-items: center;
 }
 
 .double-graphic-with-softbuttons-template .soft-button:last-child {

diff --git a/src/css/components/_h-scroll-menu.scss b/src/css/components/_h-scroll-menu.scss
@@ -3,6 +3,7 @@
     height: calc(#{$master-height} - 140px);
     overflow-y: auto;
     padding: calc(#{$master-height} / 21.6) 0px 0 0px;
+    scrollbar-width: none;
 
     @include display(flex);
     @include flex-direction(row);

diff --git a/src/css/components/_large-graphic-with-softbuttons.scss b/src/css/components/_large-graphic-with-softbuttons.scss
@@ -75,4 +75,8 @@
 .large-graphic-with-softbuttons-template .soft-button-image-static {
     max-height: 50px;
     min-width: 50px;
+    svg {
+        max-height: 50px;
+        max-width: 50px;
+    }
 }
diff --git a/src/css/components/_non-media.scss b/src/css/components/_non-media.scss
@@ -160,6 +160,8 @@
 .soft-button-image {
     height: 75px;
     max-width: 100%;
+    display: flex;
+    align-items: center;
     img {
         max-width: 100%;
         max-height: 100%;

diff --git a/src/css/components/_slider.scss b/src/css/components/_slider.scss
@@ -95,4 +95,11 @@
     @include align-items(center);
     padding: 20px;
     cursor: pointer;
+    width: 45%;
+}
+
+.slider-button-group {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
 }
diff --git a/src/css/components/_v-scroll-menu-item.scss b/src/css/components/_v-scroll-menu-item.scss
@@ -39,11 +39,11 @@
 
         div {
             width: 100%;
-            height: 85%;
+            min-height: 85%;
             display: flex;
             flex-direction: column;
             align-items: center;
-            padding: 10px;
+            padding: 0;
 
             canvas {
                 margin:auto;

diff --git a/src/css/components/_v-scroll-menu.scss b/src/css/components/_v-scroll-menu.scss
@@ -5,5 +5,6 @@
 }
 
 div::-webkit-scrollbar { 
-    display: none; 
+    display: none;
+    scrollbar-width: none;
 }
diff --git a/src/js/AppHeader.js b/src/js/AppHeader.js
@@ -188,7 +188,13 @@ class AppHeader extends React.Component {
                         sliderName={this.props.sliderName} 
                         sliderAppId={this.props.sliderAppId} 
                         sliderData={this.props.sliderData}
-                        submitCallback={ () => { this.closeSlider({closeReason: "SUBMIT"}) } }
+                        submitCallback={ (success) => { 
+                            if (success) {
+                                this.closeSlider({closeReason: "SUBMIT"})
+                            } else {
+                                this.closeSlider()
+                            }
+                        } }
                         theme={this.props.theme}
                     />
                 </Modal>

diff --git a/src/js/AppServiceMediaCard.js b/src/js/AppServiceMediaCard.js
@@ -20,9 +20,9 @@ export default class AppServiceMediaCard extends React.Component {
                 {mediaData.artist}
             </p>) : null;
 
-        var albumLine = mediaData.title ? (
+        var albumLine = mediaData.album ? (
             <p className="t-light t-small th-f-color">
-                {mediaData.title}
+                {mediaData.album}
             </p>
         ) : null;
 

diff --git a/src/js/AppServiceWeatherCard.js b/src/js/AppServiceWeatherCard.js
@@ -11,18 +11,18 @@ export default class AppServiceWeatherCard extends React.Component {
         var currentLine = weatherData.currentTemperature ? (
             <div className="weather-line t-large">
                 <p className="t-medium">
-                    {weatherData.currentTemperature + "°"}
+                    {weatherData.currentTemperature.toFixed(0) + "°"}
                 </p>
             </div>
         ) : null;
 
         var highLowLine = weatherData.high && weatherData.low ? (
             <div className="weather-line t-large">
                 <p className="t-medium">
-                    {weatherData.high + "°"}
+                    {weatherData.high.toFixed(0) + "°"}
                 </p>
                 <p className="t-light space-left">
-                    {"/ " + weatherData.low + "°"}
+                    {"/ " + weatherData.low.toFixed(0) + "°"}
                 </p>
             </div>
         ) : null;
@@ -41,7 +41,7 @@ export default class AppServiceWeatherCard extends React.Component {
         var windMPHLine = weatherData.windMPH ? (
             <div className="weather-line baseline">
                 <p className="t-medium t-large">
-                    {weatherData.windMPH}
+                    {weatherData.windMPH.toFixed(0)}
                 </p>
                 <p className="t-small t-medium ">
                     mph
@@ -54,9 +54,7 @@ export default class AppServiceWeatherCard extends React.Component {
 
         return (
             <div className="app-service-weather-card app-service-medium-tab th-f-color">
-                <div className="weather-line">
-                    <WeatherServiceImage image={weatherData.weatherIcon}/> 
-                </div>
+                <WeatherServiceImage image={weatherData.weatherIcon}/> 
                 {currentLine}
                 {highLowLine}
                 {precipProbabilityLine}

diff --git a/src/js/AppServicesNav.js b/src/js/AppServicesNav.js
@@ -119,11 +119,11 @@ class AppServicesNav extends React.Component {
                 var currentForecast = serviceData.currentForecast
 
                 weatherData = {
-                    high: currentForecast.temperatureHigh ? currentForecast.temperatureHigh.value: 0,
-                    low: currentForecast.temperatureLow ? currentForecast.temperatureLow.value : 0,
-                    precipProbability: currentForecast.precipProbability *100,
-                    windMPH: currentForecast.windSpeed,
-                    currentTemperature: currentForecast.currentTemperature ? currentForecast.currentTemperature.value : 0,
+                    high: currentForecast.temperatureHigh ? parseFloat(currentForecast.temperatureHigh.value): 0,
+                    low: currentForecast.temperatureLow ? parseFloat(currentForecast.temperatureLow.value) : 0,
+                    precipProbability: currentForecast.precipProbability * 100,
+                    windMPH: parseFloat(currentForecast.windSpeed),
+                    currentTemperature: currentForecast.currentTemperature ? parseFloat(currentForecast.currentTemperature.value) : 0,
                     weatherIcon: currentForecast.weatherIcon ? currentForecast.weatherIcon : null
                 }
             }

diff --git a/src/js/Controllers/Controller.js b/src/js/Controllers/Controller.js
@@ -137,6 +137,7 @@ export default class Controller {
         this.subscribeToNotification("BasicCommunication.OnSystemCapabilityUpdated")
         this.subscribeToNotification("AppService.OnAppServiceData")
         this.subscribeToNotification("BasicCommunication.OnAppCapabilityUpdated")
+        this.subscribeToNotification("UI.OnRecordStart")
 
         var onSystemTimeReady = {
             "jsonrpc": "2.0",

diff --git a/src/js/Controllers/DisplayCapabilities.js b/src/js/Controllers/DisplayCapabilities.js
@@ -172,7 +172,6 @@ let textWithGraphicCapabilities = {
 			imageField("menuIcon", 40),
 			imageField("cmdIcon", 85),
 			imageField("subMenuIcon", 85),
-			imageField("secondaryImage", 40),
 			imageField("menuCommandSecondaryImage", 80),
 			imageField("menuSubMenuSecondaryImage", 80),
 			imageField("appIcon", 50),
@@ -228,7 +227,6 @@ let textbuttonsWithGraphicCapabilities = {
 			imageField("menuIcon", 40),
 			imageField("cmdIcon", 85),
 			imageField("subMenuIcon", 85),
-			imageField("secondaryImage", 40),
 			imageField("menuCommandSecondaryImage", 80),
 			imageField("menuSubMenuSecondaryImage", 80),
 			imageField("appIcon", 50),
@@ -292,7 +290,6 @@ let tilesWithGraphicCapabilities = {
 			imageField("menuIcon", 40),
 			imageField("cmdIcon", 150),
 			imageField("subMenuIcon", 150),
-			imageField("secondaryImage", 40),
 			imageField("menuCommandSecondaryImage", 40),
 			imageField("menuSubMenuSecondaryImage", 40),
 			imageField("appIcon", 50),
@@ -357,7 +354,6 @@ let graphicWithTextAndSoftbuttonsCapabilities = {
 			imageField("menuIcon", 40),
 			imageField("cmdIcon", 85),
 			imageField("subMenuIcon", 85),
-			imageField("secondaryImage", 40),
 			imageField("menuCommandSecondaryImage", 80),
 			imageField("menuSubMenuSecondaryImage", 80),
 			imageField("appIcon", 50),
@@ -429,7 +425,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -492,7 +487,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -530,6 +524,16 @@ let capabilities = {
 				textField("initialInteractionText", 50),
 				textField("sliderHeader", 70),
 				textField("sliderFooter", 70),
+				textField("subtleAlertText1"),
+				textField("subtleAlertText2"),
+				textField("subtleAlertSoftButtonText"),
+				textField("menuName"),
+				textField("secondaryText"),
+				textField("tertiaryText", 20),
+				textField("menuCommandSecondaryText"),
+				textField("menuCommandTertiaryText", 20),
+				textField("menuSubMenuSecondaryText"),
+				textField("menuSubMenuTertiaryText", 20),
 				textField("audioPassThruDisplayText1", 50),
 				textField("audioPassThruDisplayText2", 50)
 			],
@@ -589,7 +593,6 @@ let capabilities = {
 				imageField("softButtonImage", 50),
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
-				imageField("secondaryImage", 85),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -652,7 +655,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -710,7 +712,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -765,7 +766,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -829,7 +829,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -889,7 +888,6 @@ let capabilities = {
 				imageField("menuIcon", 40),
 				imageField("cmdIcon", 85),
 				imageField("subMenuIcon", 85),
-				imageField("secondaryImage", 40),
 				imageField("menuCommandSecondaryImage", 80),
 				imageField("menuSubMenuSecondaryImage", 80),
 				imageField("appIcon", 50),
@@ -1067,7 +1065,7 @@ const mainWindowTypeCapability = {
 }
 
 const dynamicUpdateCapabilities = {
-	supportedDynamicImageFieldNames: ["subMenuIcon", "menuIcon", "secondaryImage"],
+	supportedDynamicImageFieldNames: ["subMenuIcon", "menuIcon"],
 	supportsDynamicSubMenus: true
 }