Browse Source

Merge branch 'dev'

keplyx 2 years ago
parent
commit
0ab9413f6a
5 changed files with 23 additions and 5 deletions
  1. 2
    2
      app.json
  2. 7
    0
      components/WebViewScreen.js
  3. 8
    1
      screens/AvailableRoomScreen.js
  4. 1
    1
      screens/PlanexScreen.js
  5. 5
    1
      screens/SelfMenuScreen.js

+ 2
- 2
app.json View File

@@ -10,7 +10,7 @@
10 10
       "android",
11 11
       "web"
12 12
     ],
13
-    "version": "1.3.0",
13
+    "version": "1.3.1",
14 14
     "orientation": "portrait",
15 15
     "primaryColor": "#be1522",
16 16
     "icon": "./assets/android.icon.png",
@@ -36,7 +36,7 @@
36 36
     },
37 37
     "android": {
38 38
       "package": "fr.amicaleinsat.application",
39
-      "versionCode": 10,
39
+      "versionCode": 11,
40 40
       "icon": "./assets/android.icon.png",
41 41
       "adaptiveIcon": {
42 42
         "foregroundImage": "./assets/android.adaptive-icon.png",

+ 7
- 0
components/WebViewScreen.js View File

@@ -198,6 +198,13 @@ export default class WebViewScreen extends React.Component<Props, State> {
198 198
                             elevation: 0, // Fix for android shadow
199 199
                         }}
200 200
                         locked={true}
201
+                        style = {{
202
+                            paddingTop: this.state.isLandscape ? 20 : 0,
203
+                            backgroundColor: Platform.OS === 'ios' ?
204
+                                ThemeManager.getCurrentThemeVariables().tabDefaultBg :
205
+                                ThemeManager.getCurrentThemeVariables().brandPrimary
206
+                        }}
207
+
201 208
                     >
202 209
                         {this.getTabbedWebview()}
203 210
                     </Tabs>}

+ 8
- 1
screens/AvailableRoomScreen.js View File

@@ -35,7 +35,14 @@ export default class AvailableRoomScreen extends React.Component<Props> {
35 35
 
36 36
         this.customBibInjectedJS =
37 37
             'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
38
-            'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_Bib + '" type="text/css"/>\';';
38
+            'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_Bib + '" type="text/css"/>\';' +
39
+            'if ($(".hero-unit-form").length > 0 && $("#customBackButton").length === 0)' +
40
+            '$(".hero-unit-form").append("' +
41
+            '<div style=\'width: 100%; display: flex\'>' +
42
+            '<a style=\'margin: auto\' href=\'' + BIB_URL + '\'>' +
43
+            '<button id=\'customBackButton\' class=\'btn btn-primary\'>Retour</button>' +
44
+            '</a>' +
45
+            '</div>");true;';
39 46
     }
40 47
 
41 48
     render() {

+ 1
- 1
screens/PlanexScreen.js View File

@@ -29,7 +29,7 @@ export default class PlanexScreen extends React.Component<Props> {
29 29
             'document.querySelector(\'head\').innerHTML += \'<meta name="viewport" content="width=device-width, initial-scale=1.0">\';' +
30 30
             'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_GENERAL + '" type="text/css"/>\';' +
31 31
             '$(".fc-toolbar .fc-center").append(\'<p id="rotateToLandscape">' + i18n.t("planexScreen.rotateToLandscape") + '</p>\');' +
32
-            '$(".fc-toolbar .fc-center").append(\'<p id="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');';
32
+            '$(".fc-toolbar .fc-center").append(\'<p id="rotateToPortrait">' + i18n.t("planexScreen.rotateToPortrait") + '</p>\');true;';
33 33
         if (ThemeManager.getNightMode())
34 34
             this.customInjectedJS += 'document.querySelector(\'head\').innerHTML += \'<link rel="stylesheet" href="' + CUSTOM_CSS_NIGHTMODE + '" type="text/css"/>\';';
35 35
     }

+ 5
- 1
screens/SelfMenuScreen.js View File

@@ -156,7 +156,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
156 156
                                 <Text style={{
157 157
                                     marginTop: 5,
158 158
                                     marginBottom: 5
159
-                                }}>{object.name.toLowerCase()}</Text>
159
+                                }}>{this.formatName(object.name)}</Text>
160 160
                                 : <View/>}
161 161
                         </View>)}
162 162
                 </CardItem>
@@ -164,5 +164,9 @@ export default class SelfMenuScreen extends FetchedDataSectionList {
164 164
         );
165 165
     }
166 166
 
167
+    formatName(name: String) {
168
+        return name.charAt(0) + name.substr(1).toLowerCase();
169
+    }
170
+
167 171
 }
168 172
 

Loading…
Cancel
Save