diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml index 34aab747086cee4c23bdc57e76fdc2bd233b317a..fea783d2f9ee47cf508e15d6f1075a39498afbcd 100644 --- a/contrib/mobile/Android/AndroidManifest.xml +++ b/contrib/mobile/Android/AndroidManifest.xml @@ -1,11 +1,11 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geuz.onelab" - android:versionName="1.6.0" - android:versionCode="29" + android:versionName="1.7.0" + android:versionCode="30" android:installLocation="auto" > <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="22" /> + android:targetSdkVersion="23" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.VIBRATE"/> <uses-feature android:glEsVersion="0x00010000" android:required="true" /> diff --git a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java index 2310b26c2a4d3924c0ec14ad5fd23207d9d6e68e..f8e373cf8d34f742cfa89e38b9e560401218f36b 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/AboutActivity.java @@ -95,7 +95,7 @@ public class AboutActivity extends Activity{ } catch (android.content.pm.PackageManager.NameNotFoundException e) { } - aboutOnelab += "<p>Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, "; + aboutOnelab += "<p>Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, "; aboutOnelab += "University of Liège</p>"; aboutOnelab += "<p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> "; aboutOnelab += "for more information</p>"; diff --git a/contrib/mobile/README.txt b/contrib/mobile/README.txt index f1426d8ef8e18c538c3504bbdde63a6f7cd30e37..a3054e04ac42028d8cb23bd9e460d1fb754eb80e 100644 --- a/contrib/mobile/README.txt +++ b/contrib/mobile/README.txt @@ -1,7 +1,7 @@ This directory contains the source code for Onelab/Mobile, the mobile version of ONELAB for iOS and Android devices. -Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, University of Liege +Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, University of Liege Onelab/Mobile (http://onelab.info) is a finite element package based on the open source mesh generator Gmsh (http://gmsh.info) and the solver GetDP diff --git a/contrib/mobile/androidUtils.cpp b/contrib/mobile/androidUtils.cpp index 4e395c81e1d4998df455bda7eb2ba6ec9dc6c8f4..62e4791d18fa0226571cf9b315d9afe665a3dd13 100644 --- a/contrib/mobile/androidUtils.cpp +++ b/contrib/mobile/androidUtils.cpp @@ -312,7 +312,7 @@ extern "C" { sstream << "<center><h3>Gmsh</h3>" << "Version " << GMSH_VERSION << " " << "(<i>Build date:</i> " << GMSH_DATE << ")" - << "<p>Copyright (C) 1997-2016 Christophe Geuzaine and Jean-François Remacle</p>" + << "<p>Copyright (C) 1997-2017 Christophe Geuzaine and Jean-François Remacle</p>" << "<p><a href=\"http://gmsh.info/doc/CREDITS.txt\">Credits</a> " << "and <a href=\"http://gmsh.info/doc/LICENSE.txt\">licensing information</a></p>" << "<p><i>Build options:</i> " << GMSH_CONFIG_OPTIONS << "</p>" @@ -326,7 +326,7 @@ extern "C" { sstream << "<center><h3>GetDP</h3>" << "Version " << GETDP_VERSION << " " << "(<i>Build date:</i> " << GETDP_DATE << ")" - << "<p>Copyright (C) 1997-2016 Patrick Dular and Christophe Geuzaine, University of Liège</p>" + << "<p>Copyright (C) 1997-2017 Patrick Dular and Christophe Geuzaine, University of Liège</p>" << "<p><a href=\"http://getdp.info/doc/CREDITS.txt\">Credits</a> " << "and <a href=\"http://getdp.info/doc/LICENSE.txt\">licensing information</a></p>" << "<p><i>Build options:</i> " << GETDP_CONFIG_OPTIONS << "</p>" diff --git a/contrib/mobile/iOS/Onelab/AboutViewController.mm b/contrib/mobile/iOS/Onelab/AboutViewController.mm index 93c425e4ca7a1f628017d470faf6bba658da5fa2..5df14bf7d8a6ed64c60a7cb7980c91a7596e8345 100644 --- a/contrib/mobile/iOS/Onelab/AboutViewController.mm +++ b/contrib/mobile/iOS/Onelab/AboutViewController.mm @@ -52,7 +52,7 @@ NSString *css = [NSString stringWithFormat:@"body { background-color: #FFFFFF; color: #252525; margin: 35px 10px 35px 10px; padding: 0; font-family: helvetica-neue,sans-serif; font-size: 1em; } b { font-weight: normal; color: rgb(%d,%d,%d); } a { color: rgb(%d,%d,%d); }", r, g, b, r, g, b]; if([self.fileToEdit isEqual:@"About"]){ - [self.aboutView loadHTMLString:[NSString stringWithFormat:@"<html><head><style type=\"text/css\">%@</style></head><body><center><p><!-- img width=32 src=\"icon_onelab.png\"--></p><h3>Onelab/Mobile</h3>Version %@<p>Copyright (C) 2014-2016 Christophe Geuzaine and Maxime Graulich, University of Liège</p><p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> for more information</p><p style=\"padding-top: 35px;\">This version of Onelab/Mobile contains:</p><h3>Gmsh</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2016 Christophe Geuzaine and Jean-François Remacle</p><p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://gmsh.info/\">http://gmsh.info</a> for more information</p><h3>GetDP</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2016 Patrick Dular and Christophe Geuzaine, University of Liège</p><p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center></body></html>", css, + [self.aboutView loadHTMLString:[NSString stringWithFormat:@"<html><head><style type=\"text/css\">%@</style></head><body><center><p><!-- img width=32 src=\"icon_onelab.png\"--></p><h3>Onelab/Mobile</h3>Version %@<p>Copyright (C) 2014-2017 Christophe Geuzaine and Maxime Graulich, University of Liège</p><p>Visit <a href=\"http://onelab.info/\">http://onelab.info/</a> for more information</p><p style=\"padding-top: 35px;\">This version of Onelab/Mobile contains:</p><h3>Gmsh</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2017 Christophe Geuzaine and Jean-François Remacle</p><p><a href=\"http://geuz.org/gmsh/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/gmsh/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://gmsh.info/\">http://gmsh.info</a> for more information</p><h3>GetDP</h3>Version %s (<i>Build date:</i> %s)<p>Copyright (C) 1997-2017 Patrick Dular and Christophe Geuzaine, University of Liège</p><p><a href=\"http://geuz.org/getdp/doc/CREDITS.txt\">Credits</a> and <a href=\"http://geuz.org/getdp/doc/LICENSE.txt\">licensing information</a></p><p><i>Build options:</i> %s</p><p>Visit <a href=\"http://getdp.info\">http://getdp.info</a> for more information</p></center></body></html>", css, [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"], GMSH_VERSION, GMSH_DATE,