Make so text fields dont get focus automatically on mobile (keep keyboard from popping up). Get compiling on Android

Author: wcjohns

src/InterSpec.cpp

@@ -4315,7 +4315,8 @@ void InterSpec::stateSaveTag()
   WGridLayout *layout = window->stretcher();
 
   WLineEdit *edit = new WLineEdit();
-  edit->setFocus(true);
+  if( !isMobile() )
+    edit->setFocus(true);
   WText *label = new WText( "Name" );
   layout->addWidget( label, 2, 0 );
   layout->addWidget( edit,  2, 1 );
@@ -7037,7 +7038,7 @@ void InterSpec::handleToolTabChanged( int tab )
   const int calibtab = m_toolsTabs->indexOf(m_calibrateContainer);
   const int searchTab = m_toolsTabs->indexOf(m_isotopeSearchContainer);
 
-  if( m_referencePhotopeakLines && (tab == refTab) )
+  if( m_referencePhotopeakLines && (tab == refTab) && !isMobile() )
     m_referencePhotopeakLines->setFocusToIsotopeEdit();
 
   if( m_isotopeSearch && (m_currentToolsTab==searchTab) )

src/ShieldingSourceDisplay.cpp

@@ -662,7 +662,12 @@ void ShieldingSelect::init()
   m_thicknessEdit->blurred().connect( this, &ShieldingSelect::removeUncertFromThickness );
 
   if( m_forFitting )
-    m_materialEdit->setFocus();
+  {
+    InterSpecApp *app = dynamic_cast<InterSpecApp *>( wApp );
+    const bool isMobile = (app && app->isMobile());
+    if( !isMobile )
+      m_materialEdit->setFocus();
+  }
 }//void ShieldingSelect::init()
 
 
@@ -3505,32 +3510,12 @@ void ShieldingSourceDisplay::Chi2Graphic::paint( Wt::WPainter &painter,
 
   if( nrow > 0 && !IsNan(sqrt(chi2)) )
   {
-    WString text;
-//The chi2/dof turns out fairly bad, so well not display it!
-//    const int dof = nrow - m_nFitForPar;
-//    if( (m_nFitForPar>0) && (dof>0) )
-//    {
-//      chi2 /= dof;
-//#ifndef WT_NO_STD_WSTRING
-//      text = L"\x03C7\x00B2/dof={1}";  //χ²
-//#else
-//      text = "&chi;<sup>2</sup>/dof={1}";  //χ²
-//#endif
-//    char buffer[32];
-//  snprintf( buffer, sizeof(buffer), "%.2g", chi2 );
-//  text.arg( buffer );
-//  }else
-//  {
-#ifndef WT_NO_STD_WSTRING
-    text = L"\x003C" L"dev\x003E={1}\x03C3";  //L"\x003Cdev\x003E={1}\x03C3"
-#else
-    text = "&lt;dev&gt;={1}&sigma;";  //χ²
-#endif
-    char buffer[32];
-    snprintf( buffer, sizeof(buffer), "%.2g", (sqrt(chi2)/nrow) );
-    text.arg( buffer );
-  
-//  }
+    char buffer[64];
+    snprintf( buffer, sizeof(buffer), "&lt;dev&gt;=%.2g&sigma;", (sqrt(chi2)/nrow) ); //χ²
+    //snprintf( buffer, sizeof(buffer), "\x3c\xCF\x87\x3E=%.2g\xCF\x83", (sqrt(chi2)/nrow) ); //χ²
+    
+    
+    WString text = WString::fromUTF8(buffer);
 
 #ifndef WT_NO_STD_WSTRING
     const size_t msglen = text.value().size();

target/android/InterSpec/app/build.gradle

@@ -23,8 +23,8 @@ android {
         applicationId "gov.sandia.interspec"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 6
-        versionName "1.0.1"
+        versionCode 7
+        versionName "1.0.1a"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -38,6 +38,7 @@ android {
         }
         signingConfig signingConfigs.config
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -49,7 +50,6 @@ android {
     }
     externalNativeBuild {
         cmake {
-            version "3.10.2"
             path "../../../../CMakeLists.txt"
         }
     }
@@ -85,7 +85,7 @@ android {
             //   armeabi-v7a, arm64-v8a, x86, x86_64
         }
     }
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '27.0.3'
 }
 
 dependencies {

target/android/InterSpec/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
 
         // NOTE: Do not place your application dependencies here; they belong

target/android/InterSpec/gradle.properties

@@ -6,8 +6,18 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-#org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+#systemProp.http.proxyHost=
+#systemProp.http.proxyPort=
+#systemProp.http.proxyUser=
+#systemProp.http.proxyPassword=
+
+#systemProp.https.proxyHost=.proxy.host
+#systemProp.https.proxyPort=
+#systemProp.https.proxyUser=
+#systemProp.https.proxyPassword=

target/android/InterSpec/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 17 13:31:10 PST 2019
+#Fri May 18 16:25:19 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

target/android/InterSpec/make_assets.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+rm -f app/src/main/assets/interspec-assets.zip
+cd ../../../ 
+zip -9 -r --exclude=*OUO* --exclude=*ouo* --exclude=*.svn* --exclude=*.git* --exclude=*.DS_Store target/android/InterSpec/app/src/main/assets/interspec-assets.zip InterSpec_resources data example_spectra
+cd build_xcode
+zip -ur -9 -r --exclude=*OUO* --exclude=*ouo* --exclude=*.svn* --exclude=*.git* --exclude=*.DS_Store ../target/android/InterSpec/app/src/main/assets/interspec-assets.zip resources
+