diff --git a/README.md b/README.md index 92823964c15808fe255d3fe21f4a1a18d90ca80d..5f166814236b2a1712b2e1d6c28a5eaba5dfc466 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,7 @@ https://developer.android.com/studio/publish#unknown-sources ## Building a production version (signing etc). +### Android [Signing the app](https://cordova.apache.org/docs/en/latest/guide/platforms/android/#signing-an-app) For NIBIO, a signing key was originally created sometime in 2021, but it has been lost. After contacting Google Play Developer Support, we received instructions for how to generate a new key (example code): @@ -211,4 +212,9 @@ We then extracted the PEM to send to Google (example code) ``` bash keytool -export -rfc -alias upload -file upload_certificate.pem -keystore keystore.jks -``` \ No newline at end of file +``` +### iOS +On iOS, do the regular `npm run build`, and then `cordova build ios`. You should then be ready to run the app in a simulator or a real device in XCode. Remember that in order to run it on a real device, you must sign it (see XCode screenshot below) with either your personal team account (for debug only) or a company account for distributing to App Store. + + + diff --git a/config.xml b/config.xml index 0ee97272f5ef7e1d134f38cbd02e79de349fcba0..33b546e60ab25385bf31c59e62b6e92281dec45a 100644 --- a/config.xml +++ b/config.xml @@ -30,5 +30,29 @@ compile to www folder</description> <platform name="ios"> <allow-intent href="itms:*" /> <allow-intent href="itms-apps:*" /> - </platform> + + <icon src="platform_assets/ios/app_icons/20.png" width="20" height="20" /> + <icon src="platform_assets/ios/app_icons/29.png" width="29" height="29" /> + <icon src="platform_assets/ios/app_icons/40.png" width="40" height="40" /> + <icon src="platform_assets/ios/app_icons/50.png" width="50" height="50" /> + <icon src="platform_assets/ios/app_icons/57.png" width="57" height="57" /> + <icon src="platform_assets/ios/app_icons/58.png" width="58" height="58" /> + <icon src="platform_assets/ios/app_icons/60.png" width="60" height="60" /> + <icon src="platform_assets/ios/app_icons/72.png" width="72" height="72" /> + <icon src="platform_assets/ios/app_icons/76.png" width="76" height="76" /> + <icon src="platform_assets/ios/app_icons/80.png" width="80" height="80" /> + <icon src="platform_assets/ios/app_icons/87.png" width="87" height="87" /> + <icon src="platform_assets/ios/app_icons/100.png" width="100" height="100" /> + <icon src="platform_assets/ios/app_icons/114.png" width="114" height="114" /> + <icon src="platform_assets/ios/app_icons/120.png" width="120" height="120" /> + <icon src="platform_assets/ios/app_icons/144.png" width="144" height="144" /> + <icon src="platform_assets/ios/app_icons/152.png" width="152" height="152" /> + <icon src="platform_assets/ios/app_icons/167.png" width="167" height="167" /> + <icon src="platform_assets/ios/app_icons/180.png" width="180" height="180" /> + <icon src="platform_assets/ios/app_icons/1024.png" width="1024" height="1024" /> + + <edit-config target="NSCameraUsageDescription" file="*-Info.plist" mode="merge"> + <string>Bruker kameraet for å ta bilder av skadegjørere i felt</string> + </edit-config> + </platform> </widget> diff --git a/document/images/ios_signing.png b/document/images/ios_signing.png new file mode 100644 index 0000000000000000000000000000000000000000..ba712840d3bd0dbae76991077287d075f1528c5d Binary files /dev/null and b/document/images/ios_signing.png differ diff --git a/index.html b/index.html index 540392ee86295deabd5247a3d32f47be45ab3a93..03e8b91d96d3f84057010635d09e0a48b6dcdac3 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@ html, body { <router-link class="navbar-brand" to="/"> <img src="static/css/images/logo_vips_hvit.png" style="height: 27px; position: relative; top: -3px; margin-right: 15px"/><span id="appHeader" ></span></router-link> - <button class="navbar-toggler border-0" type="button" data-toggle="offcanvas"> + <button class="navbar-toggler border-0" type="button" onclick="$('.offcanvas-collapse').toggleClass('open');"> <span class="navbar-toggler-icon" id="navbarTogglerIcon"></span> </button> @@ -80,7 +80,7 @@ html, body { <main id="app"/> <script src="static/js/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script> - <script>window.jQuery || document.write('<script src="static/js/vendor/jquery.slim.min.js"><\/script>')</script><script src="static/js/bootstrap.bundle.min.js"></script><script src="static/js/popper.min.js"></script> + <script>window.jQuery || document.write('<script src="static/js/jquery-3.5.1.slim.min.js"><\/script>')</script><script src="static/js/bootstrap.bundle.min.js"></script><script src="static/js/popper.min.js"></script> <script src="static/js/offcanvas.js"></script> </body> </html> diff --git a/platform_assets/ios/app_icons/100.png b/platform_assets/ios/app_icons/100.png new file mode 100644 index 0000000000000000000000000000000000000000..06121c3ddef185519e20cbba949dece647c87a44 Binary files /dev/null and b/platform_assets/ios/app_icons/100.png differ diff --git a/platform_assets/ios/app_icons/1024.png b/platform_assets/ios/app_icons/1024.png new file mode 100644 index 0000000000000000000000000000000000000000..e5771c3c97f9dfa7c2a0ec9f0e8d06afb942fa2c Binary files /dev/null and b/platform_assets/ios/app_icons/1024.png differ diff --git a/platform_assets/ios/app_icons/114.png b/platform_assets/ios/app_icons/114.png new file mode 100644 index 0000000000000000000000000000000000000000..6c818e7cf6ef22ef7b312303668b421669eeb818 Binary files /dev/null and b/platform_assets/ios/app_icons/114.png differ diff --git a/platform_assets/ios/app_icons/120.png b/platform_assets/ios/app_icons/120.png new file mode 100644 index 0000000000000000000000000000000000000000..64072a81cec0a7347b2c263baefe62f52adb2089 Binary files /dev/null and b/platform_assets/ios/app_icons/120.png differ diff --git a/platform_assets/ios/app_icons/144.png b/platform_assets/ios/app_icons/144.png new file mode 100644 index 0000000000000000000000000000000000000000..52af365d4fe9f69ac7b3c0c00536855cd09f6a3a Binary files /dev/null and b/platform_assets/ios/app_icons/144.png differ diff --git a/platform_assets/ios/app_icons/152.png b/platform_assets/ios/app_icons/152.png new file mode 100644 index 0000000000000000000000000000000000000000..79b87d33b304631f0473ee222d25bc1ee1dc6f4d Binary files /dev/null and b/platform_assets/ios/app_icons/152.png differ diff --git a/platform_assets/ios/app_icons/167.png b/platform_assets/ios/app_icons/167.png new file mode 100644 index 0000000000000000000000000000000000000000..4c47501a7b24015c3ded7ed696e16eab52ead511 Binary files /dev/null and b/platform_assets/ios/app_icons/167.png differ diff --git a/platform_assets/ios/app_icons/180.png b/platform_assets/ios/app_icons/180.png new file mode 100644 index 0000000000000000000000000000000000000000..b6922ed76747834a586bd0f461cce5ff82abc43f Binary files /dev/null and b/platform_assets/ios/app_icons/180.png differ diff --git a/platform_assets/ios/app_icons/20.png b/platform_assets/ios/app_icons/20.png new file mode 100644 index 0000000000000000000000000000000000000000..e6290097710b23a3da9099329bc51e387432f470 Binary files /dev/null and b/platform_assets/ios/app_icons/20.png differ diff --git a/platform_assets/ios/app_icons/29.png b/platform_assets/ios/app_icons/29.png new file mode 100644 index 0000000000000000000000000000000000000000..dcfd66ac9377dd471e4fd097c03265f61fc44c95 Binary files /dev/null and b/platform_assets/ios/app_icons/29.png differ diff --git a/platform_assets/ios/app_icons/40.png b/platform_assets/ios/app_icons/40.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f94d751d71ed2519f4bce60fc8ce5aebed029d Binary files /dev/null and b/platform_assets/ios/app_icons/40.png differ diff --git a/platform_assets/ios/app_icons/50.png b/platform_assets/ios/app_icons/50.png new file mode 100644 index 0000000000000000000000000000000000000000..14e398fc6474d99093708ef2a9cb3e5c12e380ee Binary files /dev/null and b/platform_assets/ios/app_icons/50.png differ diff --git a/platform_assets/ios/app_icons/57.png b/platform_assets/ios/app_icons/57.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6cecae633cd981482611a5efc64d72f18f3420 Binary files /dev/null and b/platform_assets/ios/app_icons/57.png differ diff --git a/platform_assets/ios/app_icons/58.png b/platform_assets/ios/app_icons/58.png new file mode 100644 index 0000000000000000000000000000000000000000..f0aa4bf174ad62c2ff8091f34786a21b7d43bda1 Binary files /dev/null and b/platform_assets/ios/app_icons/58.png differ diff --git a/platform_assets/ios/app_icons/60.png b/platform_assets/ios/app_icons/60.png new file mode 100644 index 0000000000000000000000000000000000000000..3252fc744e166cada5f4edb7881985dd33ac9126 Binary files /dev/null and b/platform_assets/ios/app_icons/60.png differ diff --git a/platform_assets/ios/app_icons/72.png b/platform_assets/ios/app_icons/72.png new file mode 100644 index 0000000000000000000000000000000000000000..a8287bb9454e46d6fbbf85f06d6ee546ed8a8880 Binary files /dev/null and b/platform_assets/ios/app_icons/72.png differ diff --git a/platform_assets/ios/app_icons/76.png b/platform_assets/ios/app_icons/76.png new file mode 100644 index 0000000000000000000000000000000000000000..10470ed195de1e4d7a2ca2d4a6226b717aa64a71 Binary files /dev/null and b/platform_assets/ios/app_icons/76.png differ diff --git a/platform_assets/ios/app_icons/80.png b/platform_assets/ios/app_icons/80.png new file mode 100644 index 0000000000000000000000000000000000000000..5c7841a1b3b8b15a2ae08bde90b69476cfb39dd2 Binary files /dev/null and b/platform_assets/ios/app_icons/80.png differ diff --git a/platform_assets/ios/app_icons/87.png b/platform_assets/ios/app_icons/87.png new file mode 100644 index 0000000000000000000000000000000000000000..0f66f2e8d41bf7ef9fbb2beef3eb17a1bdbd51ca Binary files /dev/null and b/platform_assets/ios/app_icons/87.png differ