Solve issues with orientation changes

Author: jsmassa

Android/MMEAndroid/app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
                 android:exported="true" />
 
         <activity
-                android:label="Mental Model Elicitation"
+                android:label="Mental Model Mapping"
                 android:name=".StartActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -54,9 +54,12 @@
 
         </activity>
 
+        <!-- Set config change to prevent webview from reloading on orientation change -->
         <activity
                 android:label="Model Mapping"
                 android:name=".MainActivity"
+                android:screenOrientation="landscape"
+                android:configChanges="keyboardHidden|orientation|screenSize|layoutDirection|uiMode"
                 android:parentActivityName=".HomeActivity" >
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"

Android/MMEAndroid/app/src/main/java/com/example/mmeandroid/MainActivity.kt

@@ -5,6 +5,7 @@ import android.app.DownloadManager
 import android.content.ContentValues
 import android.content.Context
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.media.AudioManager
 import android.net.Uri
 import android.os.Bundle
@@ -43,16 +44,18 @@ class MainActivity : AppCompatActivity() {
         actionBar.setDisplayShowTitleEnabled(false)
 
         webView = findViewById(R.id.webView)
-        webView!!.setDownloadListener { url, _, _, _, _ -> onDownload(url) }
 
-        webView!!.setWebViewClient(object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-                webView!!.loadUrl(url)
-                return true
-            }
-        })
 
         if (savedInstanceState == null) {
+            webView!!.setDownloadListener { url, _, _, _, _ -> onDownload(url) }
+
+            webView!!.setWebViewClient(object : WebViewClient() {
+                override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                    webView!!.loadUrl(url)
+                    return true
+                }
+            })
+
             webView!!.settings.javaScriptEnabled = true
             webView!!.settings.databaseEnabled = true
             webView!!.settings.domStorageEnabled = true
@@ -70,8 +73,17 @@ class MainActivity : AppCompatActivity() {
                 webView!!.settings.mediaPlaybackRequiresUserGesture = false
             }
         }
+        else {
+            webView!!.restoreState(savedInstanceState)
+        }
     }
 
+
+    public override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+    }
+
+
     public override fun onPause() {
         webView!!.onPause()
         webView!!.pauseTimers()

Android/MMEAndroid/app/src/main/java/com/example/mmeandroid/UploadActivity.kt

@@ -145,6 +145,9 @@ class UploadActivity : AppCompatActivity() {
         listView[fileType] = ArrayAdapter(this, R.layout.list_row, ArrayList<String>())
         val list = findViewById<ListView>(viewID)
         list.adapter = listView[fileType]
+
+        list.isFastScrollAlwaysVisible = true
+
     }
 
 
@@ -214,7 +217,7 @@ class UploadActivity : AppCompatActivity() {
         }
         catch (e: Exception) {
             Dialog(this@UploadActivity).showInformation(tag, warningOnImportFailure)
-            throw java.lang.Exception("Failure while reading file $fileName!")
+            throw java.lang.Exception("Failure while reading media sources file $fileName!")
         }
 
         return fileContent
@@ -249,15 +252,15 @@ class UploadActivity : AppCompatActivity() {
         val prefix = content.substringBefore("{")
 
         if (json.trimmedLength() < 1 || prefix.trimmedLength() < 1) {
-            throw java.lang.Exception("Content of mediaSources.js have format 'mediaSources = JSONOBJECT'.")
+            throw java.lang.Exception("Content of media sources file must have format 'mediaSources = JSONOBJECT'.")
         }
 
         mediaListPrefix = prefix
         try {
             mediaList = JSONObject(json)
         }
         catch (e: ClassCastException) {
-            throw java.lang.Exception( "Content of mediaSources.js must have format 'mediaSources = JSONOBJECT'.")
+            throw java.lang.Exception( "Content of media sources file must have format 'mediaSources = JSONOBJECT'.")
 
         }
         try {
@@ -268,6 +271,7 @@ class UploadActivity : AppCompatActivity() {
         catch (e: ClassCastException) {
             throw java.lang.Exception("Properties 'audio', 'video' and 'images' must exist in JSON object and contain a list of file names.")
         }
+
     }
 
 

Android/MMEAndroid/app/src/main/res/layout/activity_upload.xml

@@ -100,6 +100,8 @@
                     android:paddingStart="20dp"
                     android:divider="@null"
                     android:dividerHeight="0dp"
+                    android:scrollbars="vertical"
+                    android:scrollbarAlwaysDrawVerticalTrack="true"
                     android:fastScrollEnabled="true"/>
 
         </LinearLayout>
@@ -136,6 +138,8 @@
                     android:paddingStart="20dp"
                     android:divider="@null"
                     android:dividerHeight="0dp"
+                    android:scrollbars="vertical"
+                    android:scrollbarAlwaysDrawVerticalTrack="true"
                     android:fastScrollEnabled="true"/>
 
         </LinearLayout>
@@ -172,6 +176,8 @@
                     android:paddingStart="20dp"
                     android:divider="@null"
                     android:dividerHeight="0dp"
+                    android:scrollbars="vertical"
+                    android:scrollbarAlwaysDrawVerticalTrack="true"
                     android:fastScrollEnabled="true"/>
 
         </LinearLayout>

Android/MMEAndroid/app/src/main/res/layout/toolbar.xml

@@ -8,7 +8,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@drawable/banner_gradient_small"
-        app:theme="@style/ToolBarStyle">
+        android:theme="@style/ToolBarStyle">
         <ImageView
                 android:id="@+id/bannerImage"
                 android:layout_width="wrap_content"

Android/MMEAndroid/build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }