@eohjsc/react-native-smart-city 0.3.89 → 0.3.90

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.89",
+  "version": "0.3.90",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Device/ProgressBar/__test__/ProgressBar.test.js

@@ -36,14 +36,13 @@ describe('Test ProgressBar', () => {
       configuration: { max_value: 100 },
       value: 8,
     };
-    const data = [{ value: 10 }];
+    const data = [{ value: 10, unit: 'oC' }];
     await act(async () => {
       tree = renderer.create(wrapComponent(item, data));
     });
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
     expect(texts[0].props.children).toBe('Value bar');
-    expect(texts[1].props.children).toEqual(['Max value', ': ', 100]);
-    expect(texts[2].props.children).toEqual([10, ' ', undefined]);
+    expect(texts[1].props.children).toEqual('Max value: 100 oC');
   });
 });

package/src/commons/Device/ProgressBar/index.js

@@ -23,7 +23,7 @@ const ProgressBar = memo(({ data = [], item }) => {
       </Text>
 
       <Text size={16} style={styles.textMaxValue}>
-        {t('max_value')}: {maxValue}
+        {`${t('max_value')}: ${maxValue} ${unit || measure}`}
       </Text>
 
       <View style={styles.wrapProgressBar}>
@@ -36,9 +36,11 @@ const ProgressBar = memo(({ data = [], item }) => {
           borderWidth={0}
           borderRadius={10}
         />
-        <Text style={styles.textValue}>
-          {value} {unit || measure}
-        </Text>
+        <View>
+          <Text numberOfLines={1} style={styles.textValue}>
+            {value}
+          </Text>
+        </View>
       </View>
     </View>
   );

package/src/commons/Device/ProgressBar/styles.js

@@ -6,29 +6,32 @@ export default StyleSheet.create({
   container: {
     flex: 1,
     flexDirection: 'column', //column direction
-    marginRight: 60,
-    marginLeft: 60,
+    marginHorizontal: 30,
     borderWidth: 1,
-    padding: 12,
+    padding: 16,
     borderRadius: 8,
     borderColor: Colors.Gray4,
     marginBottom: 12,
   },
   textLabel: {
-    paddingHorizontal: 16,
+    paddingHorizontal: 15,
     paddingTop: 8,
   },
   textMaxValue: {
-    textAlign: 'right',
+    marginTop: 20,
+    marginLeft: 14,
+    textAlign: 'left',
+    fontWeight: 'bold',
+    textTransform: 'uppercase',
   },
   wrapProgressBar: {
     flex: 1,
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    padding: 8,
   },
   textValue: {
     marginLeft: 8,
+    width: 45,
   },
 });