From 8df7db2f33c4328ec7e2e81b03d08e2d198063fa Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 27 Sep 2015 18:06:04 +0000
Subject: [PATCH] better rebranding
---
contrib/mobile/Android/AndroidManifest.xml | 12 ++++++------
.../Android/src/org/geuz/onelab/AboutActivity.java | 2 ++
.../Android/src/org/geuz/onelab/GLESRender.java | 2 ++
.../Android/src/org/geuz/onelab/MainActivity.java | 2 ++
.../Android/src/org/geuz/onelab/ModelFragment.java | 2 ++
.../Android/src/org/geuz/onelab/OptionsActivity.java | 2 ++
.../src/org/geuz/onelab/OptionsDisplayFragment.java | 2 ++
.../Android/src/org/geuz/onelab/OptionsFragment.java | 2 ++
.../src/org/geuz/onelab/OptionsModelFragment.java | 2 ++
.../geuz/onelab/OptionsPostProcessingFragment.java | 2 ++
.../Android/src/org/geuz/onelab/Parameter.java | 2 ++
.../Android/src/org/geuz/onelab/ParameterNumber.java | 2 ++
.../Android/src/org/geuz/onelab/ParameterString.java | 2 ++
.../src/org/geuz/onelab/PostProcessingActivity.java | 2 ++
contrib/mobile/CMakeLists.txt | 5 -----
contrib/mobile/utils/android_build.sh | 10 ++++++++--
16 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 6208ef75f6..3e5ec6e958 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 a65dd0b877..0e04a14455 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 b3af710afd..d7e0bf6f86 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 e1c5146224..0f47d3311a 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 1c7f053c63..a78631091d 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 394e8713f8..1ce0a8aafe 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 004b228eb2..2b441d145b 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 55e733569b..b2baa90b3d 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 6d83098725..9ad823f6e0 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 1912b9b0f1..be5722f021 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 0c86a28219..028802fd01 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 523113c621..95e2f1e8a8 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 c3c0ce4680..55f511133e 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 6c520a4cb4..3d9632d38a 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 949b0983a8..60a06d3e8e 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 9f4a269773..c17719ccb4 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
--
GitLab