Fix iOS color issues (#165)

Closes: #163

Signed-off-by: Justin Georgi <justin.georgi@gmail.com>

Reviewed-on: #165

build/build-cordova.js

@@ -17,6 +17,7 @@ const build = async () => {
     format: 'iife',
     name: 'MyApp',
     sourcemap: false,
+    inlineDynamicImports :true
   });
 
   // Remove old chunk files

cordova/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="edu.midwestern.alvinn" version="0.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<widget id="edu.midwestern.alvinn" version="0.5.0-rc" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>ALVINN</name>
     <description>Anatomy Lab Visual Identification Neural Network.</description>
     <author email="jgeorg@midwestern.edu" href="https://midwestern.edu">

cordova/package-lock.json

@@ -1,20 +1,18 @@
 {
   "name": "edu.midwestern.alvinn",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "edu.midwestern.alvinn",
-      "version": "0.3.0",
+      "version": "0.4.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "cordova-android": "^12.0.1",
         "cordova-browser": "^7.0.0",
         "cordova-ios": "^7.0.1",
-        "cordova-plugin-camera": "^7.0.0",
-        "cordova-plugin-keyboard": "^1.2.0",
-        "cordova-plugin-statusbar": "^4.0.0"
+        "cordova-plugin-camera": "^7.0.0"
       }
     },
     "node_modules/@netflix/nerror": {
@@ -542,39 +540,6 @@
         }
       }
     },
-    "node_modules/cordova-plugin-keyboard": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-keyboard/-/cordova-plugin-keyboard-1.2.0.tgz",
-      "integrity": "sha512-Zng4SgDQQ2BCqeDOvrsgNlM9tcjnxmJoh0Qhex0KltMsoR0g/ONbMTpaVvI8EhNKVO8HJPnhFxxzHxrCPLQ7sQ==",
-      "dev": true,
-      "engines": [
-        {
-          "name": "cordova",
-          "version": ">=3.2.0"
-        }
-      ]
-    },
-    "node_modules/cordova-plugin-statusbar": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-4.0.0.tgz",
-      "integrity": "sha512-NTVdQhj9msydnarCH8ijOhASx+6fO16hg17AilAjfzWRvcBoF+4kKkPhTkZM7D2bOBePhfHEaMhEnxnA3M4Dlg==",
-      "dev": true,
-      "engines": {
-        "cordovaDependencies": {
-          "0.1.0": {
-            "cordova": ">=3.0.0"
-          },
-          "4.0.0": {
-            "cordova": ">=3.0.0",
-            "cordova-android": ">=10.0.0",
-            "cordova-ios": ">=6.0.0"
-          },
-          "5.0.0": {
-            "cordova": ">100"
-          }
-        }
-      }
-    },
     "node_modules/cordova-serve": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz",
@@ -2652,18 +2617,6 @@
       "integrity": "sha512-OVQWZTBb18Y6e5c+bbXt3E4Z1yGnYqaywh2h5vVr/+nxMcdMIE+lm527bRK5vLN/RUqhGYP/Z+5n+O7Fk7fVNw==",
       "dev": true
     },
-    "cordova-plugin-keyboard": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-keyboard/-/cordova-plugin-keyboard-1.2.0.tgz",
-      "integrity": "sha512-Zng4SgDQQ2BCqeDOvrsgNlM9tcjnxmJoh0Qhex0KltMsoR0g/ONbMTpaVvI8EhNKVO8HJPnhFxxzHxrCPLQ7sQ==",
-      "dev": true
-    },
-    "cordova-plugin-statusbar": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-4.0.0.tgz",
-      "integrity": "sha512-NTVdQhj9msydnarCH8ijOhASx+6fO16hg17AilAjfzWRvcBoF+4kKkPhTkZM7D2bOBePhfHEaMhEnxnA3M4Dlg==",
-      "dev": true
-    },
     "cordova-serve": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/cordova-serve/-/cordova-serve-4.0.1.tgz",

cordova/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edu.midwestern.alvinn",
   "displayName": "ALVINN",
-  "version": "0.4.0",
+  "version": "0.5.0-rc",
   "description": "Anatomy Lab Visual Identification Neural Network.",
   "main": "index.js",
   "scripts": {
@@ -16,14 +16,10 @@
     "cordova-android": "^12.0.1",
     "cordova-browser": "^7.0.0",
     "cordova-ios": "^7.0.1",
-    "cordova-plugin-camera": "^7.0.0",
-    "cordova-plugin-keyboard": "^1.2.0",
-    "cordova-plugin-statusbar": "^4.0.0"
+    "cordova-plugin-camera": "^7.0.0"
   },
   "cordova": {
     "plugins": {
-      "cordova-plugin-statusbar": {},
-      "cordova-plugin-keyboard": {},
       "cordova-plugin-camera": {
         "ANDROIDX_CORE_VERSION": "1.6.+"
       }

f7_info.md

@@ -32,7 +32,7 @@ Framework7 app created with following options:
   },
   "theming": {
     "customColor": true,
-    "color": "#002f65",
+    "color": "#0f206c",
     "darkMode": false,
     "iconFonts": true
   },

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "alvinn",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "alvinn",
-      "version": "0.3.0",
+      "version": "0.4.0",
       "hasInstallScript": true,
       "license": "UNLICENSED",
       "dependencies": {
@@ -15,7 +15,6 @@
         "framework7": "^8.3.0",
         "framework7-icons": "^5.0.5",
         "framework7-vue": "^8.3.0",
-        "material-icons": "^1.13.12",
         "skeleton-elements": "^4.0.1",
         "swiper": "^11.0.3",
         "vue": "^3.3.8"
@@ -6644,11 +6643,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/material-icons": {
-      "version": "1.13.12",
-      "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.12.tgz",
-      "integrity": "sha512-/2YoaB79IjUK2B2JB+vIXXYGtBfHb/XG66LvoKVM5ykHW7yfrV5SP6d7KLX6iijY6/G9GqwgtPQ/sbhFnOURVA=="
-    },
     "node_modules/meow": {
       "version": "12.1.1",
       "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",
@@ -14206,11 +14200,6 @@
       "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
       "dev": true
     },
-    "material-icons": {
-      "version": "1.13.12",
-      "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.13.12.tgz",
-      "integrity": "sha512-/2YoaB79IjUK2B2JB+vIXXYGtBfHb/XG66LvoKVM5ykHW7yfrV5SP6d7KLX6iijY6/G9GqwgtPQ/sbhFnOURVA=="
-    },
     "meow": {
       "version": "12.1.1",
       "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "alvinn",
   "private": true,
-  "version": "0.4.0",
+  "version": "0.5.0-rc",
   "description": "ALVINN",
   "repository": "",
   "license": "UNLICENSED",
@@ -14,7 +14,7 @@
     "cordova-ios": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run ios",
     "build-cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova build android",
     "cordova-android": "cross-env TARGET=cordova cross-env NODE_ENV=production vite build && node ./build/build-cordova.js && cd cordova && cordova run android",
-    "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/ && cpy --flat ./node_modules/material-icons/iconfont/*.* ./src/fonts/"
+    "postinstall": "cpy --flat ./node_modules/framework7-icons/fonts/*.* ./src/fonts/"
   },
   "browserslist": [
     "IOS >= 15",
@@ -28,7 +28,6 @@
     "framework7": "^8.3.0",
     "framework7-icons": "^5.0.5",
     "framework7-vue": "^8.3.0",
-    "material-icons": "^1.13.12",
     "skeleton-elements": "^4.0.1",
     "swiper": "^11.0.3",
     "vue": "^3.3.8"

public/models/abdomen-mini/descript.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.0.0-n1",
+  "region": "Coco",
+  "size": 640,
+  "epochs": 1000,
+  "name": "coco128 test",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-12",
+  "export": "coco128.yaml"
+}
+

public/models/abdomen-mini/metadata.yaml

@@ -0,0 +1,92 @@
+description: Ultralytics best model trained on /usr/src/ultralytics/ultralytics/cfg/datasets/coco128.yaml
+author: Ultralytics
+license: AGPL-3.0 https://ultralytics.com/license
+date: '2024-03-12T16:25:00.089873'
+version: 8.1.20
+stride: 32
+task: detect
+batch: 1
+imgsz:
+- 640
+- 640
+names:
+  0: person
+  1: bicycle
+  2: car
+  3: motorcycle
+  4: airplane
+  5: bus
+  6: train
+  7: truck
+  8: boat
+  9: traffic light
+  10: fire hydrant
+  11: stop sign
+  12: parking meter
+  13: bench
+  14: bird
+  15: cat
+  16: dog
+  17: horse
+  18: sheep
+  19: cow
+  20: elephant
+  21: bear
+  22: zebra
+  23: giraffe
+  24: backpack
+  25: umbrella
+  26: handbag
+  27: tie
+  28: suitcase
+  29: frisbee
+  30: skis
+  31: snowboard
+  32: sports ball
+  33: kite
+  34: baseball bat
+  35: baseball glove
+  36: skateboard
+  37: surfboard
+  38: tennis racket
+  39: bottle
+  40: wine glass
+  41: cup
+  42: fork
+  43: knife
+  44: spoon
+  45: bowl
+  46: banana
+  47: apple
+  48: sandwich
+  49: orange
+  50: broccoli
+  51: carrot
+  52: hot dog
+  53: pizza
+  54: donut
+  55: cake
+  56: chair
+  57: couch
+  58: potted plant
+  59: bed
+  60: dining table
+  61: toilet
+  62: tv
+  63: laptop
+  64: mouse
+  65: remote
+  66: keyboard
+  67: cell phone
+  68: microwave
+  69: oven
+  70: toaster
+  71: sink
+  72: refrigerator
+  73: book
+  74: clock
+  75: vase
+  76: scissors
+  77: teddy bear
+  78: hair drier
+  79: toothbrush

public/models/abdomen/classes.json

@@ -0,0 +1,82 @@
+[
+  "person",
+  "bicycle",
+  "car",
+  "motorcycle",
+  "airplane",
+  "bus",
+  "train",
+  "truck",
+  "boat",
+  "traffic light",
+  "fire hydrant",
+  "stop sign",
+  "parking meter",
+  "bench",
+  "bird",
+  "cat",
+  "dog",
+  "horse",
+  "sheep",
+  "cow",
+  "elephant",
+  "bear",
+  "zebra",
+  "giraffe",
+  "backpack",
+  "umbrella",
+  "handbag",
+  "tie",
+  "suitcase",
+  "frisbee",
+  "skis",
+  "snowboard",
+  "sports ball",
+  "kite",
+  "baseball bat",
+  "baseball glove",
+  "skateboard",
+  "surfboard",
+  "tennis racket",
+  "bottle",
+  "wine glass",
+  "cup",
+  "fork",
+  "knife",
+  "spoon",
+  "bowl",
+  "banana",
+  "apple",
+  "sandwich",
+  "orange",
+  "broccoli",
+  "carrot",
+  "hot dog",
+  "pizza",
+  "donut",
+  "cake",
+  "chair",
+  "couch",
+  "potted plant",
+  "bed",
+  "dining table",
+  "toilet",
+  "tv",
+  "laptop",
+  "mouse",
+  "remote",
+  "keyboard",
+  "cell phone",
+  "microwave",
+  "oven",
+  "toaster",
+  "sink",
+  "refrigerator",
+  "book",
+  "clock",
+  "vase",
+  "scissors",
+  "teddy bear",
+  "hair drier",
+  "toothbrush"
+]

public/models/abdomen/descript.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.0.0-n1",
+  "region": "Coco",
+  "size": 640,
+  "epochs": 1000,
+  "name": "coco128 test",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-12",
+  "export": "coco128.yaml"
+}
+

public/models/abdomen/metadata.yaml

@@ -0,0 +1,92 @@
+description: Ultralytics best model trained on /usr/src/ultralytics/ultralytics/cfg/datasets/coco128.yaml
+author: Ultralytics
+license: AGPL-3.0 https://ultralytics.com/license
+date: '2024-03-12T16:25:00.089873'
+version: 8.1.20
+stride: 32
+task: detect
+batch: 1
+imgsz:
+- 640
+- 640
+names:
+  0: person
+  1: bicycle
+  2: car
+  3: motorcycle
+  4: airplane
+  5: bus
+  6: train
+  7: truck
+  8: boat
+  9: traffic light
+  10: fire hydrant
+  11: stop sign
+  12: parking meter
+  13: bench
+  14: bird
+  15: cat
+  16: dog
+  17: horse
+  18: sheep
+  19: cow
+  20: elephant
+  21: bear
+  22: zebra
+  23: giraffe
+  24: backpack
+  25: umbrella
+  26: handbag
+  27: tie
+  28: suitcase
+  29: frisbee
+  30: skis
+  31: snowboard
+  32: sports ball
+  33: kite
+  34: baseball bat
+  35: baseball glove
+  36: skateboard
+  37: surfboard
+  38: tennis racket
+  39: bottle
+  40: wine glass
+  41: cup
+  42: fork
+  43: knife
+  44: spoon
+  45: bowl
+  46: banana
+  47: apple
+  48: sandwich
+  49: orange
+  50: broccoli
+  51: carrot
+  52: hot dog
+  53: pizza
+  54: donut
+  55: cake
+  56: chair
+  57: couch
+  58: potted plant
+  59: bed
+  60: dining table
+  61: toilet
+  62: tv
+  63: laptop
+  64: mouse
+  65: remote
+  66: keyboard
+  67: cell phone
+  68: microwave
+  69: oven
+  70: toaster
+  71: sink
+  72: refrigerator
+  73: book
+  74: clock
+  75: vase
+  76: scissors
+  77: teddy bear
+  78: hair drier
+  79: toothbrush

public/models/limbs-mini/descript.json

@@ -0,0 +1,10 @@
+{
+  "version": "0.0.1-n1",
+  "region": "Yolov8",
+  "size": 640,
+  "epochs": "NA",
+  "name": "nano1",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-28",
+  "export": "yolov8n.pt"
+}

public/models/limbs-mini/metadata.yaml

@@ -0,0 +1,92 @@
+description: Ultralytics YOLOv8n model trained on coco.yaml
+author: Ultralytics
+license: AGPL-3.0 https://ultralytics.com/license
+date: '2024-03-28T19:04:56.039396'
+version: 8.1.20
+stride: 32
+task: detect
+batch: 1
+imgsz:
+- 640
+- 640
+names:
+  0: person
+  1: bicycle
+  2: car
+  3: motorcycle
+  4: airplane
+  5: bus
+  6: train
+  7: truck
+  8: boat
+  9: traffic light
+  10: fire hydrant
+  11: stop sign
+  12: parking meter
+  13: bench
+  14: bird
+  15: cat
+  16: dog
+  17: horse
+  18: sheep
+  19: cow
+  20: elephant
+  21: bear
+  22: zebra
+  23: giraffe
+  24: backpack
+  25: umbrella
+  26: handbag
+  27: tie
+  28: suitcase
+  29: frisbee
+  30: skis
+  31: snowboard
+  32: sports ball
+  33: kite
+  34: baseball bat
+  35: baseball glove
+  36: skateboard
+  37: surfboard
+  38: tennis racket
+  39: bottle
+  40: wine glass
+  41: cup
+  42: fork
+  43: knife
+  44: spoon
+  45: bowl
+  46: banana
+  47: apple
+  48: sandwich
+  49: orange
+  50: broccoli
+  51: carrot
+  52: hot dog
+  53: pizza
+  54: donut
+  55: cake
+  56: chair
+  57: couch
+  58: potted plant
+  59: bed
+  60: dining table
+  61: toilet
+  62: tv
+  63: laptop
+  64: mouse
+  65: remote
+  66: keyboard
+  67: cell phone
+  68: microwave
+  69: oven
+  70: toaster
+  71: sink
+  72: refrigerator
+  73: book
+  74: clock
+  75: vase
+  76: scissors
+  77: teddy bear
+  78: hair drier
+  79: toothbrush

public/models/limbs/classes.json

@@ -0,0 +1,82 @@
+[
+  "person",
+  "bicycle",
+  "car",
+  "motorcycle",
+  "airplane",
+  "bus",
+  "train",
+  "truck",
+  "boat",
+  "traffic light",
+  "fire hydrant",
+  "stop sign",
+  "parking meter",
+  "bench",
+  "bird",
+  "cat",
+  "dog",
+  "horse",
+  "sheep",
+  "cow",
+  "elephant",
+  "bear",
+  "zebra",
+  "giraffe",
+  "backpack",
+  "umbrella",
+  "handbag",
+  "tie",
+  "suitcase",
+  "frisbee",
+  "skis",
+  "snowboard",
+  "sports ball",
+  "kite",
+  "baseball bat",
+  "baseball glove",
+  "skateboard",
+  "surfboard",
+  "tennis racket",
+  "bottle",
+  "wine glass",
+  "cup",
+  "fork",
+  "knife",
+  "spoon",
+  "bowl",
+  "banana",
+  "apple",
+  "sandwich",
+  "orange",
+  "broccoli",
+  "carrot",
+  "hot dog",
+  "pizza",
+  "donut",
+  "cake",
+  "chair",
+  "couch",
+  "potted plant",
+  "bed",
+  "dining table",
+  "toilet",
+  "tv",
+  "laptop",
+  "mouse",
+  "remote",
+  "keyboard",
+  "cell phone",
+  "microwave",
+  "oven",
+  "toaster",
+  "sink",
+  "refrigerator",
+  "book",
+  "clock",
+  "vase",
+  "scissors",
+  "teddy bear",
+  "hair drier",
+  "toothbrush"
+]

public/models/limbs/descript.json

@@ -0,0 +1,10 @@
+{
+  "version": "0.0.1-s1",
+  "region": "Yolov8",
+  "size": 640,
+  "epochs": "NA",
+  "name": "small1",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-28",
+  "export": "yolov8s.pt"
+}

public/models/limbs/metadata.yaml

@@ -0,0 +1,92 @@
+description: Ultralytics YOLOv8s model trained on coco.yaml
+author: Ultralytics
+license: AGPL-3.0 https://ultralytics.com/license
+date: '2024-03-28T18:46:16.622181'
+version: 8.1.20
+stride: 32
+task: detect
+batch: 1
+imgsz:
+- 640
+- 640
+names:
+  0: person
+  1: bicycle
+  2: car
+  3: motorcycle
+  4: airplane
+  5: bus
+  6: train
+  7: truck
+  8: boat
+  9: traffic light
+  10: fire hydrant
+  11: stop sign
+  12: parking meter
+  13: bench
+  14: bird
+  15: cat
+  16: dog
+  17: horse
+  18: sheep
+  19: cow
+  20: elephant
+  21: bear
+  22: zebra
+  23: giraffe
+  24: backpack
+  25: umbrella
+  26: handbag
+  27: tie
+  28: suitcase
+  29: frisbee
+  30: skis
+  31: snowboard
+  32: sports ball
+  33: kite
+  34: baseball bat
+  35: baseball glove
+  36: skateboard
+  37: surfboard
+  38: tennis racket
+  39: bottle
+  40: wine glass
+  41: cup
+  42: fork
+  43: knife
+  44: spoon
+  45: bowl
+  46: banana
+  47: apple
+  48: sandwich
+  49: orange
+  50: broccoli
+  51: carrot
+  52: hot dog
+  53: pizza
+  54: donut
+  55: cake
+  56: chair
+  57: couch
+  58: potted plant
+  59: bed
+  60: dining table
+  61: toilet
+  62: tv
+  63: laptop
+  64: mouse
+  65: remote
+  66: keyboard
+  67: cell phone
+  68: microwave
+  69: oven
+  70: toaster
+  71: sink
+  72: refrigerator
+  73: book
+  74: clock
+  75: vase
+  76: scissors
+  77: teddy bear
+  78: hair drier
+  79: toothbrush

public/models/thorax-mini/descript.json

@@ -0,0 +1,10 @@
+{
+  "version": "0.1.0-n4",
+  "region": "Thorax",
+  "size": 640,
+  "epochs": 1000,
+  "name": "nano4",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-08",
+  "export": "0.1.0-th"
+}

public/models/thorax-mini/metadata.yaml

@@ -0,0 +1,53 @@
+description: Ultralytics best model trained on /data/ALVINN/Thorax/Thorax 0.1.0/thorax.yaml
+author: Ultralytics
+license: AGPL-3.0 https://ultralytics.com/license
+date: '2024-03-08T20:14:34.118186'
+version: 8.1.20
+stride: 32
+task: detect
+batch: 1
+imgsz:
+- 640
+- 640
+names:
+  0: Abdominal diaphragm
+  1: Aorta
+  2: Azygous vein
+  3: Brachiocephalic trunk
+  4: Caudal vena cava
+  5: Cranial vena cava
+  6: Esophagus
+  7: External abdominal oblique
+  8: Iliocostalis
+  9: Latissimus dorsi
+  10: Left atrium
+  11: Left auricle
+  12: Left lung
+  13: Left subclavian artery
+  14: Left ventricle
+  15: Longissimus
+  16: Pectoralis profundus
+  17: Pectoralis superficialis
+  18: Pericardium
+  19: Phrenic nerve
+  20: Primary bronchus
+  21: Pulmonary artery
+  22: Pulmonary trunk
+  23: Pulmonary vein
+  24: Rectus abdominis
+  25: Rectus thoracis
+  26: Recurrent laryngeal nerve
+  27: Rhomboideus
+  28: Right atrium
+  29: Right auricle
+  30: Right lung
+  31: Right ventricle
+  32: Scalenus
+  33: Serratus dorsalis caudalis
+  34: Serratus dorsalis cranialis
+  35: Serratus ventralis
+  36: Spinalis
+  37: Sympathetic chain
+  38: Trachea
+  39: Trapezius
+  40: Vagus nerve

public/models/thorax/descript.json

@@ -0,0 +1,10 @@
+{
+  "version": "0.1.0-s1",
+  "region": "Thorax",
+  "size": 640,
+  "epochs": 1000,
+  "name": "small1",
+  "yolo-version": "8.1.20 docker",
+  "date": "2024-03-07",
+  "export": "0.1.0-th"
+}

src/assets/target.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <filter id="filter1847" x="-.075" y="-.075" width="1.15" height="1.15" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.3125"/>
+  </filter>
+  <radialGradient id="radialGradient1903" cx="5" cy="5" r="5.75" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#ff0" offset="0"/>
+   <stop stop-color="#ff0" stop-opacity="0" offset="1"/>
+  </radialGradient>
+ </defs>
+ <path d="m0 5 3.833274-1.166726 1.166726-3.833274 1.166726 3.833274 3.833274 1.166726-3.833274 1.166726-1.166726 3.833274-1.166726-3.833274z" color="#000000" fill="url(#radialGradient1903)" fill-rule="evenodd" filter="url(#filter1847)" opacity=".63"/>
+</svg>

src/components/app.vue

@@ -7,11 +7,11 @@
         <f7-navbar title="ALVINN"></f7-navbar>
         <f7-list>
           <f7-list-item link="/settings/" view=".view-main" panel-close=".panel-left">Settings</f7-list-item>
-          <f7-list-item link="/about/" >About ALVINN</f7-list-item>
+          <f7-list-item link="/about/" view=".view-main"  panel-close=".panel-left">About ALVINN</f7-list-item>
           <f7-list-item link="/contact/" view=".view-main" panel-close=".panel-left">Contact</f7-list-item>
         </f7-list>
         <f7-toolbar class="panel-bar" position="bottom">
-          <span>version 0.4.0</span>
+          <f7-link href="/specs/">version {{ alvinnVersion }}</f7-link>
         </f7-toolbar>
       </f7-page>
     </f7-view>
@@ -66,7 +66,8 @@
         rememberAgreement: false,
         siteAgreement: false,
         dateAgreement: null,
-        showDisclaimer: true
+        showDisclaimer: true,
+        alvinnVersion: store().getVersion
       }
     },
     created () {
@@ -85,8 +86,7 @@
       }
       var loadServerSettings = localStorage.getItem('serverSettings')
       if (!loadServerSettings) {
-        //Temp default settings for MWU deployment
-        localStorage.setItem('serverSettings','{"use":true,"address":"10.188.0.98","port":"9001","previous":{"10.188.0.98":"9001"}}')
+        localStorage.setItem('serverSettings','{"use":false,"address":"10.188.0.98","port":"9001","previous":{"10.188.0.98":"9001"}}')
       }
     },
     methods: {
@@ -132,13 +132,12 @@
       } catch {
         var darkTheme = 'auto'
       }
-      //provide('isAgreed',siteAgreement)
       const f7params = {
         name: 'ALVINN', // App name
         theme: 'auto', // Automatic theme detection
         darkMode: darkTheme,
         colors: {
-          primary: '#002f65',
+          primary: '#0f206c',
         },
 
         // App routes

src/components/svg-icon.vue

@@ -15,6 +15,7 @@
     <path v-else-if="icon == 'abdomen'" d="M120-80v-240q0-50 35-85t85-35h80q50 0 85-35t35-85q0-17-11.5-28.5T400-600q-33 0-56.5-23.5T320-680v-200h80v200q50 0 85 35t35 85q0 83-58.5 141.5T320-360h-80q-17 0-28.5 11.5T200-320v240h-80Zm240 0h-80v-80q0-50 35-85t85-35h160q83 0 141.5-58.5T760-480v-40q0-83-58.5-141.5T560-720q-33 0-56.5-23.5T480-800v-80h80v80q117 0 198.5 81.5T840-520v40q0 117-81.5 198.5T560-200H400q-17 0-28.5 11.5T360-160v80Zm-160 0v-240q0-17 11.5-28.5T240-360h80q83 0 141.5-58.5T520-560q0-50-35-85t-85-35v-200 200q50 0 85 35t35 85q0 83-58.5 141.5T320-360h-80q-17 0-28.5 11.5T200-320v240Z"/>
     <path v-else-if="icon == 'limbs'" d="M540-440q17 0 28.5-11.5T580-480q0-7-1.5-12.5T574-503q11-4 18.5-14t7.5-23q0-17-11.5-28.5T560-580q-13 0-23 7t-14 19l-146-70q2-4 2.5-8t.5-8q0-17-11.5-28.5T340-680q-17 0-28.5 11.5T300-640q0 6 2 11.5t5 10.5q-11 4-19 14t-8 24q0 17 11.5 28.5T320-540q14 0 24-7.5t14-19.5l146 70-4 17q0 17 11.5 28.5T540-440ZM394-80q-16-47-24-92.5t-10-86q-2-40.5-.5-74.5t4.5-58q-1 0 0 0-22-5-50.5-12.5t-61-20.5Q220-437 186-455.5T119-500l50-70q39 35 81.5 55.5t78.5 32q36 11.5 60 15l24 3.5q18 1 28.5 15t7.5 32l-4.5 33.5q-4.5 33.5-5 83.5t7.5 109q8 59 33 111h-86Zm366 0h-80v-423q0-48-25.5-87T586-649L313-772l49-67 257 117q64 29 102.5 88T760-503v423Zm-280 0q-25-52-33-111t-7.5-109q.5-50 5-83.5L449-417q3-18-7.5-32T413-464l-24-3.5q-24-3.5-60-15t-78.5-32Q208-535 169-570q39 35 81.5 55.5t78.5 32q36 11.5 60 15l24 3.5q18 1 28.5 15t7.5 32l-4.5 33.5q-4.5 33.5-5 83.5t7.5 109q8 59 33 111Z"/>
     <path v-else-if="icon == 'head'" d="M194-80v-395h80v315h280v-193l105-105q29-29 45-65t16-77q0-40-16.5-76T659-741l-25-26-127 127H347l-43 43-57-56 67-67h160l160-160 82 82q40 40 62 90.5T800-600q0 57-22 107.5T716-402l-82 82v240H194Zm197-187L183-475q-11-11-17-26t-6-31q0-16 6-30.5t17-25.5l84-85 124 123q28 28 43.5 64.5T450-409q0 40-15 76.5T391-267Z"/>
+    <path v-else-if="icon == 'photo_sample'" d="M240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h480q33 0 56.5 23.5T800-800v640q0 33-23.5 56.5T720-80H240Zm0-80h480v-640h-80v280l-100-60-100 60v-280H240v640Zm40-80h400L545-420 440-280l-65-87-95 127Zm-40 80v-640 640Zm200-360 100-60 100 60-100-60-100 60Z"/>
   </svg>
 </template>
   
@@ -40,7 +41,8 @@
             'thorax',
             'abdomen',
             'limbs',
-            'head'
+            'head',
+            'photo_sample'
           ]
           return iconList.includes(value)
         }

src/css/app.css

@@ -8,6 +8,7 @@ html {
   --avn-theme-color: #0f206c;
   --avn-button-bg-color: #d9d8d6;
   --avn-structure-box-color: yellow;
+  --f7-theme-color: var(--avn-theme-color) !important;
 }
 
 .dark {

src/css/detect.css

@@ -39,7 +39,8 @@
 }
 
 .chip-media {
-  background-color: var(--chip-media-background) !important;
+  /*background-color: var(--chip-media-background) !important;*/
+  background: var(--chip-media-gradient) !important;
 }
 
 .chip-results {
@@ -111,6 +112,15 @@
   max-width: 100px;
 }
 
+.dialog-buttons {
+  align-items: center;
+}
+
+.avn-dialog-button {
+  font-size: 17px;
+  align-self: center;
+}
+
 /*Additional styles for small format landscape orientation*/
 @media (max-height: 450px) and (orientation: landscape) {
   .detect-grid {

src/css/icons.css

@@ -1,30 +1,3 @@
-/* Material Icons Font (for MD theme) */
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Material Icons'), local('MaterialIcons-Regular'),
-    url(../fonts/material-icons.woff2) format('woff2'),
-    url(../fonts/material-icons.woff) format('woff');
-}
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  display: inline-block;
-  line-height: 1;
-  text-transform: none;
-  letter-spacing: normal;
-  word-wrap: normal;
-  white-space: nowrap;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  -moz-osx-font-smoothing: grayscale;
-  font-feature-settings: 'liga';
-}
-
 /* Framework7 Icons Font (for iOS theme) */
 @font-face {
   font-family: 'Framework7 Icons';
@@ -54,3 +27,29 @@
   font-feature-settings: 'liga';
   text-align: center;
 }
+
+/* Material Icons for text editor toolbar */
+@font-face {
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../fonts/material-icons.woff2") format("woff2"), url("../fonts/material-icons.woff") format("woff");
+}
+.material-icons {
+  font-family: "Material Icons";
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;
+  line-height: 1;
+  letter-spacing: normal;
+  text-transform: none;
+  display: inline-block;
+  white-space: nowrap;
+  word-wrap: normal;
+  direction: ltr;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-rendering: optimizeLegibility;
+  font-feature-settings: "liga";
+}

src/fonts/_mixins.scss

@@ -1,55 +0,0 @@
-// @see https://github.com/twbs/bootstrap/blob/main/scss/_functions.scss
-@function material-icons-str-replace($string, $search, $replace: '') {
-  $index: str-index($string, $search);
-  @if $index {
-    @return str-slice($string, 1, $index - 1) + $replace +
-      material-icons-str-replace(
-        str-slice($string, $index + str-length($search)),
-        $search,
-        $replace
-      );
-  }
-  @return $string;
-}
-
-@mixin material-icons-font-class($font-family) {
-  font-family: $font-family;
-  font-weight: normal;
-  font-style: normal;
-  font-size: $material-icons-font-size;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased; // Support for all WebKit browsers
-  -moz-osx-font-smoothing: grayscale; // Support for Firefox
-  text-rendering: optimizeLegibility; // Support for Safari and Chrome
-  font-feature-settings: 'liga'; // Support for IE
-}
-
-@mixin material-icons-font($font-family) {
-  $class-name: to-lower-case($font-family);
-  $class-name: material-icons-str-replace($class-name, ' ', '-');
-  $font-file: $material-icons-font-path + $class-name;
-
-  @font-face {
-    font-family: $font-family;
-    font-style: normal;
-    font-weight: 400;
-    font-display: $material-icons-font-display;
-    src: url('#{$font-file}.woff2') format('woff2'),
-      url('#{$font-file}.woff') format('woff');
-  }
-
-  .#{$class-name} {
-    @include material-icons-font-class($font-family);
-  }
-}
-
-@mixin material-icons() {
-  @warn "material-icons() Sass mixin has been deprecated as of 1.0. Use '@extend .material-icons;' instead of '@include material-icons();'.";
-  @include material-icons-font-class('Material Icons');
-}

src/fonts/_variables.scss

@@ -1,3 +0,0 @@
-$material-icons-font-path: './' !default;
-$material-icons-font-size: 24px !default;
-$material-icons-font-display: block !default;

src/fonts/filled.css

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: "Material Icons";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons.woff2") format("woff2"), url("./material-icons.woff") format("woff");
-}
-.material-icons {
-  font-family: "Material Icons";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/filled.scss

@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'mixins';
-
-@include material-icons-font('Material Icons');

src/fonts/material-icons.css

@@ -1,124 +0,0 @@
-@font-face {
-  font-family: "Material Icons";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons.woff2") format("woff2"), url("./material-icons.woff") format("woff");
-}
-.material-icons {
-  font-family: "Material Icons";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}
-
-@font-face {
-  font-family: "Material Icons Outlined";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-outlined.woff2") format("woff2"), url("./material-icons-outlined.woff") format("woff");
-}
-.material-icons-outlined {
-  font-family: "Material Icons Outlined";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}
-
-@font-face {
-  font-family: "Material Icons Round";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-round.woff2") format("woff2"), url("./material-icons-round.woff") format("woff");
-}
-.material-icons-round {
-  font-family: "Material Icons Round";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}
-
-@font-face {
-  font-family: "Material Icons Sharp";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-sharp.woff2") format("woff2"), url("./material-icons-sharp.woff") format("woff");
-}
-.material-icons-sharp {
-  font-family: "Material Icons Sharp";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}
-
-@font-face {
-  font-family: "Material Icons Two Tone";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-two-tone.woff2") format("woff2"), url("./material-icons-two-tone.woff") format("woff");
-}
-.material-icons-two-tone {
-  font-family: "Material Icons Two Tone";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/material-icons.scss

@@ -1,5 +0,0 @@
-@import 'filled';
-@import 'outlined';
-@import 'round';
-@import 'sharp';
-@import 'two-tone';

src/fonts/outlined.css

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: "Material Icons Outlined";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-outlined.woff2") format("woff2"), url("./material-icons-outlined.woff") format("woff");
-}
-.material-icons-outlined {
-  font-family: "Material Icons Outlined";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/outlined.scss

@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'mixins';
-
-@include material-icons-font('Material Icons Outlined');

src/fonts/round.css

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: "Material Icons Round";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-round.woff2") format("woff2"), url("./material-icons-round.woff") format("woff");
-}
-.material-icons-round {
-  font-family: "Material Icons Round";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/round.scss

@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'mixins';
-
-@include material-icons-font('Material Icons Round');

src/fonts/sharp.css

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: "Material Icons Sharp";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-sharp.woff2") format("woff2"), url("./material-icons-sharp.woff") format("woff");
-}
-.material-icons-sharp {
-  font-family: "Material Icons Sharp";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/sharp.scss

@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'mixins';
-
-@include material-icons-font('Material Icons Sharp');

src/fonts/two-tone.css

@@ -1,24 +0,0 @@
-@font-face {
-  font-family: "Material Icons Two Tone";
-  font-style: normal;
-  font-weight: 400;
-  font-display: block;
-  src: url("./material-icons-two-tone.woff2") format("woff2"), url("./material-icons-two-tone.woff") format("woff");
-}
-.material-icons-two-tone {
-  font-family: "Material Icons Two Tone";
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;
-  line-height: 1;
-  letter-spacing: normal;
-  text-transform: none;
-  display: inline-block;
-  white-space: nowrap;
-  word-wrap: normal;
-  direction: ltr;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-rendering: optimizeLegibility;
-  font-feature-settings: "liga";
-}

src/fonts/two-tone.scss

@@ -1,4 +0,0 @@
-@import 'variables';
-@import 'mixins';
-
-@include material-icons-font('Material Icons Two Tone');

src/js/routes.js

@@ -4,6 +4,8 @@ import AboutPage from '../pages/about.vue';
 import SettingsPage from '../pages/settings.vue';
 import DetectPage from '../pages/detect.vue';
 import ContactPage from  '../pages/contact.vue';
+import SpecsPage from  '../pages/specs.vue';
+import HelpPage from  '../pages/help.vue';
 
 import NotFoundPage from '../pages/404.vue';
 
@@ -16,13 +18,21 @@ var routes = [
     path: '/about/',
     component: AboutPage,
   },
+  {
+    path: '/help/',
+    component: HelpPage,
+  },
+  {
+    path: '/specs/',
+    component: SpecsPage,
+  },
   {
     path: '/detect/:region/',
     component: DetectPage,
   },
   {
     path: '/settings/',
-    component: SettingsPage,
+    component: SettingsPage
   },
   {
     path: '/contact/',

src/js/store.js

@@ -2,7 +2,8 @@ import { reactive, computed } from 'vue';
 
 const state = reactive({
     disclaimerAgreement: false,
-    enabledRegions: ['thorax','abdomen','limbs']
+    enabledRegions: ['thorax','abdomen','limbs'],
+    version: '0.5.0-rc'
   })
 
 const agree = () => {
@@ -12,5 +13,6 @@ const agree = () => {
 export default () => ({
   isAgreed: computed(() => state.disclaimerAgreement),
   getRegions: computed(() => state.enabledRegions),
+  getVersion: computed(() => state.version),
   agree
 })

src/manifest.json

@@ -4,9 +4,9 @@
   "description": "ALVINN",
   "lang": "en-US",
   "start_url": "/",
-  "display": "standalone",
-  "background_color": "#002f65",
-  "theme_color": "#002f65",
+  "display": "fullscreen",
+  "background_color": "#0f206c",
+  "theme_color": "#0f206c",
   "icons": [
     {
       "src": "../icons/128x128.png",