Skip to content

12 26 #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2023
Merged

12 26 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b90c1
ANDROID: update web UI dependencies
chrisws Mar 23, 2023
b95a6ea
ANDROID: Fix setenv error #187
chrisws Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,8 @@ private final class Storage {
private final String _media;

private Storage() {
String external = null;
String media = null;
String external = "";
String media = "";

String path = Environment.getExternalStorageDirectory().getAbsolutePath();
if (isPublicStorage(path)) {
Expand Down
14 changes: 7 additions & 7 deletions src/platform/android/webui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"private": true,
"proxy": "http://localhost:8080",
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.15",
"@mui/material": "^5.10.15",
"@mui/x-data-grid": "^5.17.12",
"npm-check-updates": "^16.4.3",
"@emotion/react": "^11.10.6",
"@emotion/styled": "^11.10.6",
"@mui/icons-material": "^5.11.11",
"@mui/material": "^5.11.14",
"@mui/x-data-grid": "^6.0.2",
"npm-check-updates": "^16.8.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1"
},
"scripts": {
"start": "react-scripts start",
"build": "GENERATE_SOURCEMAP=false react-scripts build && rm ../app/src/main/assets/webui/static/js/main.* && cp -R build/* ../app/src/main/assets/webui/",
"update": "npm update && ncu"
"update": "npm update && ncu -u"
},
"eslintConfig": {
"extends": [
Expand Down
17 changes: 7 additions & 10 deletions src/platform/android/webui/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ const columns = [{
field: 'fileName',
headerName: 'Name',
editable: true,
valueGetter: (params) => {
return params.row.fileName;
},
valueGetter: (params) => params.row.fileName,
flex: 1,
}, {
field: 'size',
Expand All @@ -58,9 +56,8 @@ const columns = [{
headerName: 'Modified',
type: 'date',
minWidth: 110,
renderCell: (params) => {
return new Date(params.row.date).toLocaleDateString();
}
valueGetter: (params) => new Date(params.row.date),
renderCell: (params) => params.value.toLocaleDateString()
}];

function getFetchHeader(body) {
Expand Down Expand Up @@ -322,11 +319,11 @@ function FileList(props) {
autoPageSize
components={{Toolbar: AppToolbar}}
componentsProps={{toolbar: toolbarProps}}
onSelectionModelChange={(model) => setSelectionModel(model)}
selectionModel={selectionModel}
rowsPerPageOptions={[5]}
onRowSelectionModelChange={(model) => setSelectionModel(model)}
rowSelectionModel={selectionModel}
pageSizeOptions={[5]}
checkboxSelection
disableSelectionOnClick/>
disableRowSelectionOnClick/>
</Fragment>
);
}
Expand Down