Merge pull request #202 from mngoe/csu-to-merge

print version in about

Author: delcroip

app/src/main/assets/pages/About.html

@@ -45,7 +45,7 @@ <h1 strName="app_name_policies"></h1>
 <div>
     <ul class="ulList infoOnly">
         <li id="liUploadRenewals">
-            <span class="lbl" id="Version" strName="Version"></span><span id="VersionValue" class="info" id="beta">2.2.0</span>
+            <span class="lbl" id="Version" strName="Version"></span><span id="VersionValue" class="info" >2.2.0</span>
         </li>
         <li id="liUploadFeedback">
             <span class="lbl" id="ReleaseDate" strName="ReleaseDate"></span><span id="ReleaseDateValue" strName="ReleaseDateValue" class="info"></span>

app/src/main/assets/pages/About.js

@@ -1,3 +1,7 @@
 $(document).ready(function () {
     document.title = Android.getString('About');
+
+    let appVersion = document.getElementById("VersionValue");
+    var version = Android.getVersion();
+    appVersion.textContent = version;
 });

app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java

@@ -5264,4 +5264,9 @@ public void exportLogs() {
                 (d, i) -> new Thread(() -> Log.zipLogFiles(activity)).start()
         );
     }
+
+    @JavascriptInterface
+    public String getVersion(){
+        return BuildConfig.VERSION_NAME;
+    }
 }