Improved more filters button

kiwigrid · Nov 22, 2021 · ac0f7d0 · ac0f7d0
1 parent 152bedc
commit ac0f7d0
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 10 deletions.
diff --git a/src/I18n/languages/cz.json b/src/I18n/languages/cz.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Domovská stránka",

diff --git a/src/I18n/languages/de.json b/src/I18n/languages/de.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Home",

diff --git a/src/I18n/languages/en.json b/src/I18n/languages/en.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Home",

diff --git a/src/I18n/languages/es.json b/src/I18n/languages/es.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Menú principal",

diff --git a/src/I18n/languages/fr.json b/src/I18n/languages/fr.json
@@ -77,7 +77,9 @@
     "result": "Résultat",
     "optional": "Optionnel",
     "defaultSettings": "Paramètres par défaut",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Voir plus",
+    "showLess": "Voir moins"
   },
   "sidebar": {
     "home": "Home",

diff --git a/src/I18n/languages/it.json b/src/I18n/languages/it.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Home",

diff --git a/src/I18n/languages/pt.json b/src/I18n/languages/pt.json
@@ -77,7 +77,9 @@
     "result": "Result",
     "optional": "Optional",
     "defaultSettings": "Default Settings",
-    "notApplicable": "N/A"
+    "notApplicable": "N/A",
+    "showMore": "Show more",
+    "showLess": "Show less"
   },
   "sidebar": {
     "home": "Home",

diff --git a/src/components/search/filter/containers/FilterContainerComponentStyles.tsx b/src/components/search/filter/containers/FilterContainerComponentStyles.tsx
@@ -24,6 +24,21 @@ export default function computeStyleSheet(): StyleSheet.NamedStyles<any> {
     visibleExpandedIcon: {
       fontSize: '25@s',
       color: commonColor.textColor
+    },
+    filterButtonText: {
+      fontSize: "15@s",
+      color: commonColor.textColor,
+      textAlign: 'right'
+    },
+    filterButtonContainer: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      justifyContent: 'flex-end',
+      width: '100%'
+    },
+    filterButtonIcon: {
+      fontSize: '25@s',
+      color: commonColor.textColor
     }
   });
   const portraitStyles = {};

diff --git a/src/components/search/filter/containers/FilterVisibleContainerComponent.tsx b/src/components/search/filter/containers/FilterVisibleContainerComponent.tsx
@@ -4,6 +4,8 @@ import { TouchableOpacity } from 'react-native-gesture-handler';
 
 import FilterContainerComponent, { FilterContainerComponentProps, FilterContainerComponentState } from './FilterContainerComponent';
 import computeStyleSheet from './FilterContainerComponentStyles';
+import { Text } from 'react-native';
+import I18n from 'i18n-js';
 
 export interface Props extends FilterContainerComponentProps {
   expanded?: boolean;
@@ -47,9 +49,15 @@ export default class FilterVisibleContainerComponent extends FilterContainerComp
         {onExpand && (
           <TouchableOpacity style={style.visibleExpandedContainer} onPress={this.toggleExpanded}>
             {expanded ? (
-              <Icon style={style.visibleExpandedIcon} type="MaterialIcons" name="keyboard-arrow-up" />
+              <View style={style.filterButtonContainer}>
+                <Text style={style.filterButtonText}>{I18n.t('general.showLess')}</Text>
+                <Icon style={style.filterButtonIcon} type={'MaterialIcons'} name={'keyboard-arrow-up'} />
+              </View>
             ) : (
-              <Icon style={style.visibleExpandedIcon} type="MaterialIcons" name="keyboard-arrow-down" />
+              <View style={style.filterButtonContainer}>
+                <Text style={style.filterButtonText}>{I18n.t('general.showMore')}</Text>
+                <Icon style={style.filterButtonIcon} type={'MaterialIcons'} name={'keyboard-arrow-down'} />
+              </View>
             )}
           </TouchableOpacity>
         )}

diff --git a/src/screens/charging-stations/list/ChargingStations.tsx b/src/screens/charging-stations/list/ChargingStations.tsx
@@ -18,7 +18,7 @@ import LocationManager from '../../../location/LocationManager';
 import computeModalStyle from '../../../ModalStyles';
 import ProviderFactory from '../../../provider/ProviderFactory';
 import BaseProps from '../../../types/BaseProps';
-import ChargingStation, { ChargePointStatus, Connector } from '../../../types/ChargingStation';
+import ChargingStation, { Connector } from '../../../types/ChargingStation';
 import { DataResult } from '../../../types/DataResult';
 import { GlobalFilters } from '../../../types/Filter';
 import SiteArea from '../../../types/SiteArea';