diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 6208ef75f617b14b4581838e0a5f5f2cb0b8931f..3e5ec6e958d3bd1ba6a8b167824954aa3fd89c5e 100644
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@ -15,7 +15,7 @@
android:theme="@style/AppTheme"
android:logo="@drawable/ic_launcher"
android:allowBackup="true" >
- <activity android:name="org.geuz.onelab.SplashScreen"
+ <activity android:name=".SplashScreen"
android:label="@string/title_activity_main"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<intent-filter>
@@ -38,15 +38,15 @@
<data android:mimeType="application/zip" />
</intent-filter>
</activity>
- <activity android:name="org.geuz.onelab.MainActivity"
+ <activity android:name=".MainActivity"
android:label="@string/title_activity_main"/>
- <activity android:name="org.geuz.onelab.ModelList"
+ <activity android:name=".ModelList"
android:label="@string/title_activity_main"/>
- <activity android:name="org.geuz.onelab.AboutActivity"
+ <activity android:name=".AboutActivity"
android:label="@string/title_activity_about"/>
- <activity android:name="org.geuz.onelab.PostProcessingActivity"
+ <activity android:name=".PostProcessingActivity"
android:label="@string/title_activity_main"/>
- <activity android:name="org.geuz.onelab.OptionsActivity"
+ <activity android:name=".OptionsActivity"
android:label="@string/title_activity_options">
</activity>
</application>
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
index a65dd0b877a7e20849c6e9ca502df96e4f60182c..0e04a14455a2f47aee1e74a6a17f0b1bb8a81398 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.lang.String;
import android.app.Activity;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java b/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
index b3af710afdb0330bfe83efd527923b0e97bf640b..d7e0bf6f866464030cf155c6b3ac35ba0981b05b 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/GLESRender.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.nio.IntBuffer;
import javax.microedition.khronos.egl.EGLConfig;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index e1c5146224830c9ab58045d3fef0f93be5fe45b0..0f47d3311a58591d39140a45478e56bcf8877580 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java
index 1c7f053c63ad5c44ba8c64d4139e19f50c998c8e..a78631091db57b66c163556bbeee13bf8530975b 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsActivity.java
index 394e8713f8c3dab25b0f80c552e6dd1894871a59..1ce0a8aafe32eb0a956cc8d9fc775bf9f8c8c491 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsActivity.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsDisplayFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsDisplayFragment.java
index 004b228eb265c23b05c06ade4fa0824b814dee16..2b441d145bfa2c9d35363f854ca3c28d38ad7975 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsDisplayFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsDisplayFragment.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import android.os.Bundle;
import android.os.Parcelable;
import android.app.Fragment;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsFragment.java
index 55e733569b47e73babd667d4019a70e5977007d9..b2baa90b3de973d4e07bff1d6ae89d03aa64a838 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsFragment.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
index 6d83098725c8b88c577afbd5298c19ebe3b9584f..9ad823f6e09072f123fcc1fac456611ccbaa5246 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsModelFragment.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java
index 1912b9b0f1338e2ce587a646c216f9c8ef51bea1..be5722f0214aa8b33df0a16a6f3d0bcb50d675da 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.util.ArrayList;
import java.lang.Math;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
index 0c86a282199833c5d945954bd506dff9b3bf87fd..028802fd019f7490d8024d9e5f2ca4c3b646621c 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/Parameter.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import android.content.Context;
import android.graphics.Color;
import android.widget.LinearLayout;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java
index 523113c6212063f5377c078fd8fde9ad11bd678e..95e2f1e8a88c23004fd78ca5be8ed150e624923a 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.util.ArrayList;
import android.app.Activity;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ParameterString.java b/contrib/mobile/Android/src/org/geuz/onelab/ParameterString.java
index c3c0ce4680e970e07aac92dbf57dba62c8c17feb..55f511133e74175837f53b71a8bd87e1d9069f92 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/ParameterString.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ParameterString.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import java.util.ArrayList;
import android.content.Context;
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/PostProcessingActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/PostProcessingActivity.java
index 6c520a4cb42fae203354c487b0d4aef7f39f0dae..3d9632d38a1604d9a6000b6c8b293f0190d42d62 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/PostProcessingActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/PostProcessingActivity.java
@@ -1,5 +1,7 @@
package org.geuz.onelab;
+import org.geuz.onelab.Gmsh;
+
import android.app.Activity;
import android.os.Bundle;
import android.view.MenuItem;
diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt
index 949b0983a870d2b4be439693945cc78ef023e460..60a06d3e8ed145eb535587d57cc91ec5ee811a55 100644
--- a/contrib/mobile/CMakeLists.txt
+++ b/contrib/mobile/CMakeLists.txt
@@ -145,11 +145,6 @@ if(ENABLE_BUILD_ANDROID)
append_src(drawString.cpp)
append_src(drawGeom.cpp)
append_src(drawMesh.cpp)
- # android-cmake toolchain
- find_file(CMAKE_TOOLCHAIN_FILE "android.toolchain.cmake")
- if(NOT CMAKE_TOOLCHAIN_FILE)
- message(SEND_ERROR "Could not find Android CMake toolchain")
- endif(NOT CMAKE_TOOLCHAIN_FILE)
# GetDP lib
find_library(GETDP_LIB Getdp PATH_SUFFIXES lib)
find_path(GETDP_INC "GetDP.h" PATH_SUFFIXES include getdp include/getdp)
diff --git a/contrib/mobile/utils/android_build.sh b/contrib/mobile/utils/android_build.sh
index 9f4a26977304f7b7b00aa30f9bf26276e462c6a8..c17719ccb46ddce1e009f887b3411f9fc7653b4e 100755
--- a/contrib/mobile/utils/android_build.sh
+++ b/contrib/mobile/utils/android_build.sh
@@ -76,9 +76,15 @@ make androidProject
check
if [ $# -eq 1 ] ; then
- cd $appname;
+ cd $appname
+ # change package name
+ rm -rf src/org/geuz/$appname
+ mv src/org/geuz/onelab/ src/org/geuz/$appname
+ mkdir src/org/geuz/onelab
+ mv src/org/geuz/$appname/Gmsh.java src/org/geuz/onelab
+ sed -e "s/org\.geuz\.onelab/org\.geuz\.$appname/g" -i "" AndroidManifest.xml
+ find . -type f -name '*.java' -not -name 'Gmsh.java' -exec sed -e "s/package org\.geuz\.onelab/package org\.geuz\.$appname/g" -i "" {} \;
# change app name and icons
- sed -e "s/package=\"org\.geuz\.onelab/package=\"org\.geuz\.$appname/" -i "" AndroidManifest.xml
sed -e "s/Onelab/$appname/" -i "" res/values/strings.xml
cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-128x128.png res/drawable-hdpi/ic_launcher.png
cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-64x64.png res/drawable-mdpi/ic_launcher.png