Merge branch 'release/1.3'

README.md

@@ -33,6 +33,9 @@ SWADroid uses [ZXing][zxing-library] library developed by [Sean Owen][zxing-auth
 [![Copyright and License](http://www.apache.org/images/asf_logo_simple.png)][apache2]
 SWADroid uses [Universal Image Loader][universal-image-loader-library] library developed by [Sergey Tarasevich][universal-image-loader-author] and licensed under [Apache License 2.0][apache2].
 
+[![Copyright and License](http://www.apache.org/images/asf_logo_simple.png)][apache2]
+SWADroid uses [MathJax][mathjax] library developed by The MathJax Team and licensed under [Apache License 2.0][apache2].
+
 ## Author
 
 * [Juan Miguel Boyero Corral][urlJuanMiguel]
@@ -66,6 +69,7 @@ The Github team has also been kind enough to write up some great [documentation]
 [zxing-author]: https://github.com/srowen
 [universal-image-loader-library]: https://github.com/nostra13/Android-Universal-Image-Loader
 [universal-image-loader-author]: https://github.com/nostra13
+[mathjax]: https://www.mathjax.org/
 [apache2]: http://www.apache.org/licenses/LICENSE-2.0
 [apk]: https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid
 [urlJuanMiguel]: http://www.linkedin.com/pub/juan-miguel-boyero-corral/27/362/163 "LinkedIn profile"

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="es.ugr.swad.swadroid"
     android:installLocation="auto"
-    android:versionCode="69"
-    android:versionName="1.2.4" >
+    android:versionCode="70"
+    android:versionName="1.3" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -40,7 +40,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher_swadroid"
         android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat.Light" >
+        android:theme="@style/Theme.AppCompat.Light"
+        android:hardwareAccelerated="true">
         <meta-data android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
         <activity
@@ -258,6 +259,36 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="es.ugr.swad.swadroid.SWADMain" />
         </activity>
+        <activity
+            android:name="es.ugr.swad.swadroid.modules.marks.Marks"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light"
+            android:label="@string/marksModuleLabel"
+            android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="es.ugr.swad.swadroid.SWADMain" />
+        </activity>
+        <activity
+            android:name="es.ugr.swad.swadroid.modules.marks.GetMarks"
+            android:label="@string/marksModuleLabel"
+            android:theme="@style/Theme.AppCompat.Translucent" >
+        </activity>
+        <activity
+            android:name="es.ugr.swad.swadroid.modules.account.CreateAccountActivity"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.Light"
+            android:label="@string/createAccountModuleLabel"
+            android:parentActivityName="es.ugr.swad.swadroid.LoginActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="es.ugr.swad.swadroid.SWADMain" />
+        </activity>
+        <activity
+            android:name="es.ugr.swad.swadroid.modules.account.CreateAccount"
+            android:label="@string/createAccountModuleLabel"
+            android:theme="@style/Theme.AppCompat.Translucent" >
+        </activity>
         <activity
             android:name="es.ugr.swad.swadroid.modules.notifications.NotificationsMarkAllAsRead"
             android:label="@string/notificationsMarkAllAsReadModuleLabel"

app/src/main/assets/MathJax/bower.json

@@ -0,0 +1,11 @@
+{
+  "name": "MathJax",
+  "main": "./MathJax.js",
+  "homepage": "http://www.mathjax.org/",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "components"
+  ],
+  "keywords": ["math", "js", "LaTeX", "MathML", "AsciiMath"]
+}

app/src/main/assets/MathJax/composer.json

@@ -0,0 +1,22 @@
+{
+    "name": "mathjax/mathjax",
+    "type": "library",
+    "description": "MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all modern browsers.",
+    "keywords": ["math", "js", "LaTeX", "MathML", "AsciiMath"],
+    "homepage": "http://www.mathjax.org/",
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "Davide Cervone",
+            "homepage": "https://github.com/dpvc"
+        },
+        {
+            "name": "Christian Perfect",
+            "homepage": "https://github.com/christianp"
+        },
+        {
+            "name": "Peter Krautzberger",
+            "homepage": "https://github.com/pkra"
+        }
+    ]
+}

app/src/main/assets/MathJax/extensions/HTML-CSS/handle-floats.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/extensions/HTML-CSS/handle-floats.js
+ *
+ *  Copyright (c) 2009-2015 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Extension["HTML-CSS/handle-floats"]={version:"2.5.1"};MathJax.Hub.Config({"HTML-CSS":{styles:{".MathJax_Display":{display:"table-cell",padding:"1em 0 ! important",width:(MathJax.Hub.Browser.isMSIE&&(document.documentMode||0)<8?"100%":"1000em")}}}});MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function(){var a=MathJax.OutputJax["HTML-CSS"],b=a.Translate;a.Augment({Translate:function(c,f){b.apply(this,arguments);if(c.MathJax.elementJax.HTMLCSS.display){var e=c.nextSibling;if(!e||e.className!=="MathJax_MSIE_Separator"){var d=a.Element("span",{className:"MathJax_MSIE_Separator"});c.parentNode.insertBefore(d,e)}}}});MathJax.Hub.Startup.signal.Post("HTML-CSS handle-floats Ready")});MathJax.Ajax.loadComplete("[MathJax]/extensions/HTML-CSS/handle-floats.js");