Merge pull request #2 from modos189/up

.github/workflows/test-build.yml

@@ -31,7 +31,7 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Install six
-        run: pip install six
+        run: python3 -m pip install six
 
       - name: Install NativeScript
         run: |

.gitignore

@@ -26,3 +26,5 @@ typings/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+package-lock.json

App_Resources/Android/app.gradle

@@ -11,9 +11,9 @@
 
 android {
   defaultConfig {
-    minSdkVersion 19
-    compileSdkVersion = 31
-    targetSdkVersion = 31
+    minSdkVersion 23
+    compileSdkVersion 33
+    targetSdkVersion 33
     generatedDensities = []
   }
   aaptOptions {

README.md

@@ -0,0 +1,18 @@
+# IITC Prime
+
+New IITC mobile app
+
+## Getting started
+
+How to prepare your environment to work with NativeScript is described here: https://docs.nativescript.org/environment-setup.html
+
+## Usage
+
+Build apk for Android:
+`tns build android`
+
+Run the app on Android:
+`tns run android`
+
+Run Vue DevTools:
+`npx vue-devtools`

app/app.js

@@ -1,6 +1,6 @@
 //@license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3
 
-import VueDevtools from 'nativescript-vue-devtools'
+// import VueDevtools from 'nativescript-vue-devtools'
 import Vue from 'nativescript-vue'
 
 import Main from '~/components/Main'
@@ -20,7 +20,7 @@ Vue.use(CanvasSVG);
 
 import store from './store';
 
-Vue.use(VueDevtools, { host: '192.168.42.10' })
+// Vue.use(VueDevtools, { host: '192.168.42.10' })
 Vue.config.silent = false;
 
 new Vue({

app/components/AppWebView.vue

@@ -4,6 +4,7 @@
     viewPortSize="width=device-width, initial-scale=1.0"
     domStorage=true
     @loaded="webViewLoaded"
+    @loadStarted="loadStarted"
     @loadFinished="loadFinished"
     @shouldOverrideUrlLoading="shouldOverrideUrlLoading"
     @JSBridge="JSBridge"
@@ -101,13 +102,14 @@
         }
       },
 
+      async loadStarted(args) {
+        await this.$store.dispatch('setIsWebViewLoadFinished', false);
+      },
+
       async loadFinished(args) {
         await injectBridgeIITC(webview);
-
-        const iitc_code = await storage.get("release_iitc_code").then(obj => obj["release_iitc_code"]);
-        await webview.executeJavaScript(iitc_code);
-
         await injectIITCPrimeResources(webview);
+        await this.$store.dispatch('setIsWebViewLoadFinished', true);
       }
     },
 
@@ -119,6 +121,9 @@
       this.store_unsubscribe = this.$store.subscribeAction({
         after: async (action, state) => {
           switch (action.type) {
+            case "setInjectPlugin":
+              await webview.executeJavaScript(action.payload['code']);
+              break;
             case "setActiveBaseLayer":
               await webview.executeJavaScript(showLayer(action.payload, true));
               break;

app/components/Main.vue

@@ -49,7 +49,8 @@
       return {
         status_bar_height: 0,
         navigation_bar_height: 0,
-        show_top_padding: false
+        show_top_padding: false,
+        store_unsubscribe: function() {}
       }
     },
     components: { AppWebView, AppBar, ProgressBar },
@@ -86,10 +87,26 @@
 
     async created() {
       console.log("IITC create event fired");
-      const manager = new Manager({
-        storage: storage
-      });
-      await manager.run()
+
+      const params = {
+        storage: storage,
+        message: (message, args) => {
+          console.log("Message for user:");
+          console.log(message+", args: "+args);
+        },
+        progressbar: is_show => {
+          if (is_show) {
+            console.log("Show progress bar");
+          } else {
+            console.log("Hide progress bar");
+          }
+        },
+        inject_plugin: (p) => {
+          this.$store.dispatch('setInjectPlugin', p);
+        }
+      };
+      const manager = new Manager(params);
+      manager.run().then();
 
       if (Application.android) {
         Application.android.on(AndroidApplication.activityBackPressedEvent, (args) => {
@@ -103,6 +120,11 @@
       this.store_unsubscribe = this.$store.subscribeAction({
         after: async (action, state) => {
           switch (action.type) {
+            case "setIsWebViewLoadFinished":
+              if (action.payload) {
+                await manager.inject();
+              }
+              break;
             case "setCurrentPane":
               this.show_top_padding = !["all", "faction", "alerts", "info", "map"].includes(action.payload);
               break;

app/store/actions.js

@@ -7,6 +7,9 @@ export default {
   setIsOpenedBottomSheet({commit}, status) {
     commit('setIsOpenedBottomSheet', status);
   },
+  setIsWebViewLoadFinished({commit}, status) {
+    commit('setIsWebViewLoadFinished', status);
+  },
 
   addPane({commit}, pane) {
     commit('addPane', pane);
@@ -39,5 +42,8 @@ export default {
   },
   setLocation({commit}, property) {
     commit('setLocation', property);
+  },
+  setInjectPlugin({commit}, property) {
+    commit('setInjectPlugin', property);
   }
 }

app/store/index.js

@@ -14,6 +14,7 @@ const store = new Vuex.Store({
   state: {
     appbar_width: 100,
     is_opened_bottom_sheet: false,
+    is_webview_load_finished: false,
 
     panes: [
       {name: "all", label: "All", icon: "mdi-list"},
@@ -28,6 +29,7 @@ const store = new Vuex.Store({
     overlay_layers: [],
     progress: 0,
     location: {lat: 0, lng: 0, accuracy: 0, is_target: false},
+    injectPlugin: {}
   },
   mutations,
   actions,

app/store/mutations.js

@@ -7,6 +7,9 @@ export default {
   setIsOpenedBottomSheet(state, status) {
     state.is_opened_bottom_sheet = status;
   },
+  setIsWebViewLoadFinished(state, status) {
+    state.is_webview_load_finished = status;
+  },
 
   addPane(state, pane) {
     state.panes.push(pane);
@@ -29,7 +32,10 @@ export default {
   setProgress(state, progress) {
     state.progress = progress;
   },
-  setLocation(state, progress) {
-    state.location = progress;
+  setLocation(state, location) {
+    state.location = location;
+  },
+  setInjectPlugin(state, injectPlugin) {
+    state.injectPlugin = injectPlugin;
   }
 }