diff --git a/README.md b/README.md index 39183afb8..e2fe2414b 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,49 @@ -# SWADroid +SWADroid +======== -Android client for e-learning platform [![SWADroid](https://openswad.org/logo/swad84x24.png "OpenSWAD")][swad] +Android client for e-learning platform [![SWADroid](https://openswad.org/logo/swad84x24.png)](http://openswad.org/) -[![SWADroid](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png "Install from Google Play")][apk] +[![SWADroid](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid) -* Code: `git clone https://github.com/Amab/SWADroid.git` -* Issue tracker: +- Code: `git clone https://github.com/Amab/SWADroid.git` +- Issue tracker: https://github.com/Amab/SWADroid/issues -[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/c/c8/Farm-Fresh_twitter_1.png "SWADroid on Twitter")][Twitter] -[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/4/4d/Farm-Fresh_facebook.png "SWADroid on Facebook")][Facebook] -[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/b/ba/Google_plus_32.png "SWADroid on Google+")][Google+] -[![SWADroid](https://s.w.org/about/images/logos/wordpress-logo-32-blue.png "SWADroid on Wordpress")][Wordpress] +[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/c/c8/Farm-Fresh_twitter_1.png)](http://twitter.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/4/4d/Farm-Fresh_facebook.png)](https://www.facebook.com/SWADroid)[![SWADroid](http://upload.wikimedia.org/wikipedia/commons/b/ba/Google_plus_32.png)](https://plus.google.com/115615684349730524355/posts)[![SWADroid](https://s.w.org/about/images/logos/wordpress-logo-32-blue.png)](http://swadroid.wordpress.com) - -## Copyright and License +Copyright and License +--------------------- Copyright (C) 2010, Juan Miguel Boyero Corral -[![Copyright and License](http://www.gnu.org/graphics/gplv3-88x31.png)][gplv3] -SWADroid client is free software; you can redistribute it and/or modify -it under the same terms as [GPLv3][gplv3] license. - -[![Copyright and License](http://www.gnu.org/graphics/lgplv3-88x31.png)][lgplv3] -SWADroid uses [Android DataFrameWork][androiddataframework-library] library developed by [Javier Pérez Pacheco][androiddataframework-author] and licensed under [LGPLv3][lgplv3]. - -[![Copyright and License](http://upload.wikimedia.org/wikipedia/commons/8/83/License_icon-mit.png)][mit] -SWADroid uses [ksoap2-android][ksoap2-library] library developed by [Manfred Moser][ksoap2-author] and licensed under [MIT][mit]. - -[![Copyright and License](http://www.apache.org/images/asf_logo_simple.png)][apache2] -SWADroid uses [ZXing][zxing-library] library developed by [Sean Owen][zxing-author] and licensed under [Apache License 2.0][apache2]. - -[![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] - -## Contributors - -* [Antonio Cañas Vargas][urlAntonioCanas] -* [Helena Rodríguez Gijón][urlHelena] -* [Antonio Aguilera Malagón][urlAntonioAguilera] -* [José Antonio Guerrero Avilés][urlJose] -* [Alejandro Alcalde][urlAlex] - -## Contributing - -SWADroid is an open source project. I encourage contributions. - -The Github team has also been kind enough to write up some great [documentation][doc_contrib] on working with pull requests. Contributions should be performed on [topic branches][topic_br] in your personal forks - just issue your pull requests from there. - - -[swad]: http://openswad.org/ -[gplv3]: http://www.gnu.org/licenses/gpl.html -[lgplv3]: http://www.gnu.org/licenses/lgpl.html -[mit]: http://www.opensource.org/licenses/mit-license.php -[doc_contrib]: http://help.github.com/pull-requests/ -[topic_br]: http://progit.org/book/ch3-4.html -[ksoap2-library]: http://code.google.com/p/ksoap2-android -[ksoap2-author]: https://github.com/mosabua -[androiddataframework-library]: http://code.google.com/p/androiddataframework/ -[androiddataframework-author]: http://www.javielinux.com/quiensoy.php -[zxing-library]: http://code.google.com/p/zxing/ -[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" -[urlAntonioCanas]: http://www.ugr.es/~acanas/ "Personal web" -[urlHelena]: http://prezi.com/user/7ofwrjzwrfsq/ "Prezi profile" -[urlAntonioAguilera]: http://www.slideshare.net/antonioaguileramalagon "Slideshare profile" -[urlJose]: http://www.linkedin.com/in/antonioguerreroaviles "LinkedIn profile" -[urlAlex]: http://elbauldelprogramador.com/ "Personal blog" -[Twitter]: http://twitter.com/SWADroid -[Facebook]: https://www.facebook.com/SWADroid -[Google+]: https://plus.google.com/115615684349730524355/posts -[Wordpress]: http://swadroid.wordpress.com +[![Copyright and License](https://img.shields.io/badge/license-GPLv3-green.svg?style=flat)](http://www.gnu.org/licenses/gpl.html) SWADroid client is free software; you can redistribute it and/or modify it under the same terms as [GPLv3](http://www.gnu.org/licenses/gpl.html) license. + +[![Copyright and License](https://img.shields.io/badge/license-LGPLv3-green.svg?style=flat)](http://www.gnu.org/licenses/lgpl.html) SWADroid uses [Android DataFrameWork](http://code.google.com/p/androiddataframework/) library developed by [Javier Pérez Pacheco](http://www.javielinux.com/quiensoy.php) and licensed under [LGPLv3](http://www.gnu.org/licenses/lgpl.html). + +[![Copyright and License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](http://www.opensource.org/licenses/mit-license.php) SWADroid uses [ksoap2-android](http://code.google.com/p/ksoap2-android) library developed by [Manfred Moser](https://github.com/mosabua) and licensed under [MIT](http://www.opensource.org/licenses/mit-license.php). + +[![Copyright and License](https://img.shields.io/badge/license-Apache%202-green.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) SWADroid uses [ZXing](http://code.google.com/p/zxing/) library developed by [Sean Owen](https://github.com/srowen) and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). + +[![Copyright and License](https://img.shields.io/badge/license-Apache%202-green.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) SWADroid uses [Universal Image Loader](https://github.com/nostra13/Android-Universal-Image-Loader) library developed by [Sergey Tarasevich](https://github.com/nostra13) and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). + +[![Copyright and License](https://img.shields.io/badge/license-Apache%202-green.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) SWADroid uses [MathJax](https://www.mathjax.org/) library developed by The MathJax Team and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). + +Author +------ + +- [Juan Miguel Boyero Corral](http://www.linkedin.com/pub/juan-miguel-boyero-corral/27/362/163) + +Contributors +------------ + +- [Antonio Cañas Vargas](http://www.ugr.es/~acanas/) +- [Helena Rodríguez Gijón](http://prezi.com/user/7ofwrjzwrfsq/) +- [Antonio Aguilera Malagón](http://www.slideshare.net/antonioaguileramalagon) +- [José Antonio Guerrero Avilés](http://www.linkedin.com/in/antonioguerreroaviles) +- [Alejandro Alcalde](http://elbauldelprogramador.com/) + +Contributing +------------ + +SWADroid is an open source project. I encourage contributions. + +The Github team has also been kind enough to write up some great [documentation](http://help.github.com/pull-requests/) on working with pull requests. Contributions should be performed on [topic branches](http://progit.org/book/ch3-4.html) in your personal forks - just issue your pull requests from there. diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle new file mode 100644 index 000000000..dc5c764c2 --- /dev/null +++ b/SWADroid/build.gradle @@ -0,0 +1,62 @@ +apply plugin: 'com.android.application' + +ext { + git = org.ajoberstar.grgit.Grgit.open() + gitVersionCode = git.tag.list().size() + gitVersionName = "${git.describe()}" +} + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.2" + defaultConfig { + applicationId "es.ugr.swad.swadroid" + versionCode gitVersionCode + versionName gitVersionName + + minSdkVersion 9 + targetSdkVersion 23 + + android.applicationVariants.all { variant -> + def appName + //Check if an applicationName property is supplied; if not use the name of the parent project. + if (project.hasProperty("applicationName")) { + appName = applicationName + } else { + appName = parent.name + } + + variant.outputs.each { output -> + def newApkName + //If there's no ZipAlign task it means that our artifact will be unaligned and we need to mark it as such. + if (output.zipAlign) { + newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk" + } else { + newApkName = "${appName}-${output.baseName}-${variant.versionName}-unaligned.apk" + } + output.outputFile = new File(output.outputFile.parent, newApkName) + } + } + + testApplicationId "es.ugr.swad.swadroid.test" + testInstrumentationRunner "android.test.InstrumentationTestRunner" + + + } + buildTypes { + debug { + versionNameSuffix '-DEBUG' + } + } +} + +dependencies { + compile 'com.android.support:support-v4:latest.release' + compile 'com.android.support:appcompat-v7:latest.release' + compile 'com.google.android.gms:play-services:latest.release' + compile 'com.google.code.gson:gson:latest.release' + compile 'com.google.code.ksoap2-android:ksoap2-android:latest.release' + compile 'commons-io:commons-io:latest.release' + compile 'com.nostra13.universalimageloader:universal-image-loader:latest.release' + compile 'com.google.zxing:core:2.1' +} \ No newline at end of file diff --git a/SWADroid/lint.xml b/SWADroid/lint.xml new file mode 100644 index 000000000..4327a2ed0 --- /dev/null +++ b/SWADroid/lint.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/SWADroid/src/main/AndroidManifest.xml similarity index 95% rename from app/src/main/AndroidManifest.xml rename to SWADroid/src/main/AndroidManifest.xml index 0b0ae383a..adbeddee2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/SWADroid/src/main/AndroidManifest.xml @@ -1,9 +1,7 @@ + android:installLocation="auto" > @@ -55,15 +53,15 @@ @@ -103,7 +101,7 @@ android:theme="@style/Theme.AppCompat.Translucent" > @@ -119,14 +117,15 @@ + android:parentActivityName="es.ugr.swad.swadroid.SWADMain" + android:exported="true"> @@ -192,7 +191,7 @@ android:label="@string/messagesModuleLabel"> @@ -232,7 +231,7 @@ android:value="es.ugr.swad.swadroid.SWADMain" /> @@ -242,7 +241,7 @@ android:theme="@style/Theme.AppCompat.Translucent" > + android:parentActivityName=".modules.login.LoginActivity" > @@ -295,7 +294,7 @@ android:theme="@style/Theme.AppCompat.Translucent" > diff --git a/app/src/main/assets/MathJax/MathJax.js b/SWADroid/src/main/assets/MathJax/MathJax.js similarity index 100% rename from app/src/main/assets/MathJax/MathJax.js rename to SWADroid/src/main/assets/MathJax/MathJax.js diff --git a/app/src/main/assets/MathJax/bower.json b/SWADroid/src/main/assets/MathJax/bower.json similarity index 100% rename from app/src/main/assets/MathJax/bower.json rename to SWADroid/src/main/assets/MathJax/bower.json diff --git a/app/src/main/assets/MathJax/composer.json b/SWADroid/src/main/assets/MathJax/composer.json similarity index 100% rename from app/src/main/assets/MathJax/composer.json rename to SWADroid/src/main/assets/MathJax/composer.json diff --git a/app/src/main/assets/MathJax/extensions/CHTML-preview.js b/SWADroid/src/main/assets/MathJax/extensions/CHTML-preview.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/CHTML-preview.js rename to SWADroid/src/main/assets/MathJax/extensions/CHTML-preview.js diff --git a/app/src/main/assets/MathJax/extensions/FontWarnings.js b/SWADroid/src/main/assets/MathJax/extensions/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/extensions/FontWarnings.js diff --git a/app/src/main/assets/MathJax/extensions/HTML-CSS/handle-floats.js b/SWADroid/src/main/assets/MathJax/extensions/HTML-CSS/handle-floats.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/HTML-CSS/handle-floats.js rename to SWADroid/src/main/assets/MathJax/extensions/HTML-CSS/handle-floats.js diff --git a/app/src/main/assets/MathJax/extensions/HelpDialog.js b/SWADroid/src/main/assets/MathJax/extensions/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/extensions/HelpDialog.js diff --git a/app/src/main/assets/MathJax/extensions/MatchWebFonts.js b/SWADroid/src/main/assets/MathJax/extensions/MatchWebFonts.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MatchWebFonts.js rename to SWADroid/src/main/assets/MathJax/extensions/MatchWebFonts.js diff --git a/app/src/main/assets/MathJax/extensions/MathEvents.js b/SWADroid/src/main/assets/MathJax/extensions/MathEvents.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MathEvents.js rename to SWADroid/src/main/assets/MathJax/extensions/MathEvents.js diff --git a/app/src/main/assets/MathJax/extensions/MathML/content-mathml.js b/SWADroid/src/main/assets/MathJax/extensions/MathML/content-mathml.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MathML/content-mathml.js rename to SWADroid/src/main/assets/MathJax/extensions/MathML/content-mathml.js diff --git a/app/src/main/assets/MathJax/extensions/MathML/mml3.js b/SWADroid/src/main/assets/MathJax/extensions/MathML/mml3.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MathML/mml3.js rename to SWADroid/src/main/assets/MathJax/extensions/MathML/mml3.js diff --git a/app/src/main/assets/MathJax/extensions/MathMenu.js b/SWADroid/src/main/assets/MathJax/extensions/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MathMenu.js rename to SWADroid/src/main/assets/MathJax/extensions/MathMenu.js diff --git a/app/src/main/assets/MathJax/extensions/MathZoom.js b/SWADroid/src/main/assets/MathJax/extensions/MathZoom.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/MathZoom.js rename to SWADroid/src/main/assets/MathJax/extensions/MathZoom.js diff --git a/app/src/main/assets/MathJax/extensions/Safe.js b/SWADroid/src/main/assets/MathJax/extensions/Safe.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/Safe.js rename to SWADroid/src/main/assets/MathJax/extensions/Safe.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/AMScd.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/AMScd.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/AMScd.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/AMScd.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/AMSmath.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/AMSmath.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/AMSmath.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/AMSmath.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/AMSsymbols.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/AMSsymbols.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/AMSsymbols.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/AMSsymbols.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/HTML.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/HTML.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/HTML.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/HTML.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/action.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/action.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/action.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/action.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/autobold.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/autobold.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/autobold.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/autobold.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/autoload-all.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/autoload-all.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/autoload-all.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/autoload-all.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/bbox.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/bbox.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/bbox.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/bbox.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/begingroup.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/begingroup.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/begingroup.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/begingroup.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/boldsymbol.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/boldsymbol.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/boldsymbol.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/boldsymbol.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/cancel.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/cancel.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/cancel.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/cancel.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/color.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/color.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/color.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/color.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/enclose.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/enclose.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/enclose.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/enclose.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/extpfeil.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/extpfeil.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/extpfeil.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/extpfeil.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/mathchoice.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/mathchoice.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/mathchoice.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/mathchoice.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/mediawiki-texvc.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/mediawiki-texvc.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/mediawiki-texvc.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/mediawiki-texvc.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/mhchem.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/mhchem.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/mhchem.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/mhchem.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/newcommand.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/newcommand.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/newcommand.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/newcommand.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/noErrors.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/noErrors.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/noErrors.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/noErrors.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/noUndefined.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/noUndefined.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/noUndefined.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/noUndefined.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/unicode.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/unicode.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/unicode.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/unicode.js diff --git a/app/src/main/assets/MathJax/extensions/TeX/verb.js b/SWADroid/src/main/assets/MathJax/extensions/TeX/verb.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/TeX/verb.js rename to SWADroid/src/main/assets/MathJax/extensions/TeX/verb.js diff --git a/app/src/main/assets/MathJax/extensions/asciimath2jax.js b/SWADroid/src/main/assets/MathJax/extensions/asciimath2jax.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/asciimath2jax.js rename to SWADroid/src/main/assets/MathJax/extensions/asciimath2jax.js diff --git a/app/src/main/assets/MathJax/extensions/jsMath2jax.js b/SWADroid/src/main/assets/MathJax/extensions/jsMath2jax.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/jsMath2jax.js rename to SWADroid/src/main/assets/MathJax/extensions/jsMath2jax.js diff --git a/app/src/main/assets/MathJax/extensions/mml2jax.js b/SWADroid/src/main/assets/MathJax/extensions/mml2jax.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/mml2jax.js rename to SWADroid/src/main/assets/MathJax/extensions/mml2jax.js diff --git a/app/src/main/assets/MathJax/extensions/tex2jax.js b/SWADroid/src/main/assets/MathJax/extensions/tex2jax.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/tex2jax.js rename to SWADroid/src/main/assets/MathJax/extensions/tex2jax.js diff --git a/app/src/main/assets/MathJax/extensions/toMathML.js b/SWADroid/src/main/assets/MathJax/extensions/toMathML.js similarity index 100% rename from app/src/main/assets/MathJax/extensions/toMathML.js rename to SWADroid/src/main/assets/MathJax/extensions/toMathML.js diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_AMS-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Bold.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Caligraphic-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Bold.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Fraktur-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Bold.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Italic.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Main-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-BoldItalic.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Italic.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Math-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Bold.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Italic.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_SansSerif-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Script-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size1-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size2-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size3-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Size4-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_Typewriter-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/eot/MathJax_WinIE6-Regular.eot diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_AMS-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Bold.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Caligraphic-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Bold.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Fraktur-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Bold.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Italic.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Main-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-BoldItalic.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Italic.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Math-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Bold.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Italic.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_SansSerif-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Script-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size1-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size2-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size3-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Size4-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_Typewriter-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinChrome-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/otf/MathJax_WinIE6-Regular.otf diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Bold.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Caligraphic-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Bold.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Fraktur-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Bold.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Italic.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Main-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-BoldItalic.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Italic.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Math-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Bold.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Italic.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_SansSerif-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Script-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size1-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size2-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size3-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Size4-Regular.woff diff --git a/app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff b/SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff similarity index 100% rename from app/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff rename to SWADroid/src/main/assets/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_Typewriter-Regular.woff diff --git a/app/src/main/assets/MathJax/images/CloseX-31.png b/SWADroid/src/main/assets/MathJax/images/CloseX-31.png similarity index 100% rename from app/src/main/assets/MathJax/images/CloseX-31.png rename to SWADroid/src/main/assets/MathJax/images/CloseX-31.png diff --git a/app/src/main/assets/MathJax/images/MenuArrow-15.png b/SWADroid/src/main/assets/MathJax/images/MenuArrow-15.png similarity index 100% rename from app/src/main/assets/MathJax/images/MenuArrow-15.png rename to SWADroid/src/main/assets/MathJax/images/MenuArrow-15.png diff --git a/app/src/main/assets/MathJax/jax/element/mml/jax.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/jax.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/jax.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/jax.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/Arrows.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Arrows.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/Arrows.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Arrows.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/CombDiactForSymbols.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/CombDiactForSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/CombDiactForSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/CombDiactForSymbols.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/Dingbats.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Dingbats.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/Dingbats.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Dingbats.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/GeneralPunctuation.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GeneralPunctuation.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/GeneralPunctuation.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GeneralPunctuation.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/GeometricShapes.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GeometricShapes.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/GeometricShapes.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GeometricShapes.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/GreekAndCoptic.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GreekAndCoptic.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/GreekAndCoptic.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/GreekAndCoptic.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/Latin1Supplement.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Latin1Supplement.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/Latin1Supplement.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/Latin1Supplement.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/LetterlikeSymbols.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/LetterlikeSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/LetterlikeSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/LetterlikeSymbols.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/MathOperators.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/MathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MathOperators.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsA.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/MiscTechnical.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscTechnical.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/MiscTechnical.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/MiscTechnical.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/SpacingModLetters.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SpacingModLetters.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/SpacingModLetters.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SpacingModLetters.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/SuppMathOperators.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SuppMathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/SuppMathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SuppMathOperators.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsA.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsA.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsA.js diff --git a/app/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsB.js b/SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsB.js similarity index 100% rename from app/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsB.js rename to SWADroid/src/main/assets/MathJax/jax/element/mml/optable/SupplementalArrowsB.js diff --git a/app/src/main/assets/MathJax/jax/input/AsciiMath/config.js b/SWADroid/src/main/assets/MathJax/jax/input/AsciiMath/config.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/AsciiMath/config.js rename to SWADroid/src/main/assets/MathJax/jax/input/AsciiMath/config.js diff --git a/app/src/main/assets/MathJax/jax/input/AsciiMath/jax.js b/SWADroid/src/main/assets/MathJax/jax/input/AsciiMath/jax.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/AsciiMath/jax.js rename to SWADroid/src/main/assets/MathJax/jax/input/AsciiMath/jax.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/config.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/config.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/config.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/config.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/a.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/a.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/a.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/a.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/b.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/b.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/b.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/b.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/c.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/c.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/c.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/c.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/d.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/d.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/d.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/d.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/e.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/e.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/e.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/e.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/f.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/f.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/f.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/f.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/fr.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/fr.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/fr.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/fr.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/g.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/g.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/g.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/g.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/h.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/h.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/h.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/h.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/i.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/i.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/i.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/i.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/j.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/j.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/j.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/j.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/k.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/k.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/k.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/k.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/l.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/l.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/l.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/l.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/m.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/m.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/m.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/m.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/n.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/n.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/n.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/n.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/o.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/o.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/o.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/o.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/opf.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/opf.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/opf.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/opf.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/p.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/p.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/p.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/p.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/q.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/q.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/q.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/q.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/r.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/r.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/r.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/r.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/s.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/s.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/s.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/s.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/scr.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/scr.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/scr.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/scr.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/t.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/t.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/t.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/t.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/u.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/u.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/u.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/u.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/v.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/v.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/v.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/v.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/w.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/w.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/w.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/w.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/x.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/x.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/x.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/x.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/y.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/y.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/y.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/y.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/entities/z.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/z.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/entities/z.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/entities/z.js diff --git a/app/src/main/assets/MathJax/jax/input/MathML/jax.js b/SWADroid/src/main/assets/MathJax/jax/input/MathML/jax.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/MathML/jax.js rename to SWADroid/src/main/assets/MathJax/jax/input/MathML/jax.js diff --git a/app/src/main/assets/MathJax/jax/input/TeX/config.js b/SWADroid/src/main/assets/MathJax/jax/input/TeX/config.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/TeX/config.js rename to SWADroid/src/main/assets/MathJax/jax/input/TeX/config.js diff --git a/app/src/main/assets/MathJax/jax/input/TeX/jax.js b/SWADroid/src/main/assets/MathJax/jax/input/TeX/jax.js similarity index 100% rename from app/src/main/assets/MathJax/jax/input/TeX/jax.js rename to SWADroid/src/main/assets/MathJax/jax/input/TeX/jax.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/maction.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/maction.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/maction.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/maction.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/menclose.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/menclose.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/menclose.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/menclose.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mglyph.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mglyph.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mglyph.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mglyph.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mmultiscripts.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mmultiscripts.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mmultiscripts.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mmultiscripts.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/ms.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/ms.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/ms.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/ms.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mtable.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mtable.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mtable.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/mtable.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/multiline.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/multiline.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/multiline.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/autoload/multiline.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/config.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/config.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/config.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/config.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Arrows.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BBBold.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/BoxDrawing.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Dingbats.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Dingbats.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Dingbats.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Dingbats.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/EnclosedAlphanum.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/EnclosedAlphanum.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/EnclosedAlphanum.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/EnclosedAlphanum.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeneralPunctuation.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeneralPunctuation.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeneralPunctuation.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeneralPunctuation.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeometricShapes.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeometricShapes.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeometricShapes.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GeometricShapes.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GreekAndCoptic.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GreekAndCoptic.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GreekAndCoptic.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/GreekAndCoptic.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Latin1Supplement.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Latin1Supplement.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Latin1Supplement.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Latin1Supplement.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LatinExtendedA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LatinExtendedA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LatinExtendedA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LatinExtendedA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LetterlikeSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LetterlikeSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LetterlikeSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/LetterlikeSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MathOperators.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MathOperators.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscTechnical.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscTechnical.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscTechnical.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/MiscTechnical.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/PUA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/PUA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/PUA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/PUA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/PUA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Regular/PUA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Bold/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/BoldItalic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Italic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Greek/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Arrows.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Arrows.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Arrows.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Arrows.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiactForSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiactForSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiactForSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/CombDiactForSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeneralPunctuation.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeneralPunctuation.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeneralPunctuation.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeneralPunctuation.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeometricShapes.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeometricShapes.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeometricShapes.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/GeometricShapes.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Latin1Supplement.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Latin1Supplement.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Latin1Supplement.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Latin1Supplement.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedB.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedB.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedB.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LatinExtendedB.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LetterlikeSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LetterlikeSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LetterlikeSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/LetterlikeSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MathOperators.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MathOperators.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/LetterlikeSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/LetterlikeSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/LetterlikeSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/LetterlikeSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/GeometricShapes.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/GeometricShapes.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/GeometricShapes.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/GeometricShapes.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/MiscSymbols.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/MiscSymbols.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/MiscSymbols.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/MiscSymbols.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/SpacingModLetters.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/SpacingModLetters.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/SpacingModLetters.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Regular/SpacingModLetters.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/BoldItalic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Math/Italic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Bold/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Italic/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/SansSerif/Regular/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Script/Regular/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size1/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size2/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size3/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Size4/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/BasicLatin.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/BasicLatin.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/BasicLatin.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/BasicLatin.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/Typewriter/Regular/Other.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/imageFonts.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/imageFonts.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/imageFonts.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/imageFonts.js diff --git a/app/src/main/assets/MathJax/jax/output/HTML-CSS/jax.js b/SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/jax.js similarity index 100% rename from app/src/main/assets/MathJax/jax/output/HTML-CSS/jax.js rename to SWADroid/src/main/assets/MathJax/jax/output/HTML-CSS/jax.js diff --git a/app/src/main/assets/MathJax/localization/ast/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ast/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ast/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ast/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ast/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ast/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ast/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ast/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ast/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ast/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ast/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ast/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ast/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ast/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ast/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ast/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ast/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ast/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ast/ast.js b/SWADroid/src/main/assets/MathJax/localization/ast/ast.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ast/ast.js rename to SWADroid/src/main/assets/MathJax/localization/ast/ast.js diff --git a/app/src/main/assets/MathJax/localization/bcc/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/bcc/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/bcc/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/bcc/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/bcc/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/bcc/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/bcc/MathML.js b/SWADroid/src/main/assets/MathJax/localization/bcc/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/MathML.js diff --git a/app/src/main/assets/MathJax/localization/bcc/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/bcc/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/bcc/TeX.js b/SWADroid/src/main/assets/MathJax/localization/bcc/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/TeX.js diff --git a/app/src/main/assets/MathJax/localization/bcc/bcc.js b/SWADroid/src/main/assets/MathJax/localization/bcc/bcc.js similarity index 100% rename from app/src/main/assets/MathJax/localization/bcc/bcc.js rename to SWADroid/src/main/assets/MathJax/localization/bcc/bcc.js diff --git a/app/src/main/assets/MathJax/localization/br/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/br/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/br/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/br/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/br/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/br/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/br/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/br/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/br/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/br/MathML.js b/SWADroid/src/main/assets/MathJax/localization/br/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/br/MathML.js diff --git a/app/src/main/assets/MathJax/localization/br/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/br/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/br/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/br/TeX.js b/SWADroid/src/main/assets/MathJax/localization/br/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/br/TeX.js diff --git a/app/src/main/assets/MathJax/localization/br/br.js b/SWADroid/src/main/assets/MathJax/localization/br/br.js similarity index 100% rename from app/src/main/assets/MathJax/localization/br/br.js rename to SWADroid/src/main/assets/MathJax/localization/br/br.js diff --git a/app/src/main/assets/MathJax/localization/ca/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ca/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ca/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ca/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ca/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ca/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ca/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ca/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ca/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ca/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ca/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ca/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ca/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ca/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ca/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ca/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ca/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ca/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ca/ca.js b/SWADroid/src/main/assets/MathJax/localization/ca/ca.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ca/ca.js rename to SWADroid/src/main/assets/MathJax/localization/ca/ca.js diff --git a/app/src/main/assets/MathJax/localization/cdo/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/cdo/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/cdo/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/cdo/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/cdo/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/cdo/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/cdo/MathML.js b/SWADroid/src/main/assets/MathJax/localization/cdo/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/MathML.js diff --git a/app/src/main/assets/MathJax/localization/cdo/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/cdo/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/cdo/TeX.js b/SWADroid/src/main/assets/MathJax/localization/cdo/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/TeX.js diff --git a/app/src/main/assets/MathJax/localization/cdo/cdo.js b/SWADroid/src/main/assets/MathJax/localization/cdo/cdo.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cdo/cdo.js rename to SWADroid/src/main/assets/MathJax/localization/cdo/cdo.js diff --git a/app/src/main/assets/MathJax/localization/ce/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ce/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ce/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ce/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ce/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ce/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ce/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ce/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ce/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ce/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ce/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ce/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ce/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ce/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ce/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ce/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ce/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ce/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ce/ce.js b/SWADroid/src/main/assets/MathJax/localization/ce/ce.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ce/ce.js rename to SWADroid/src/main/assets/MathJax/localization/ce/ce.js diff --git a/app/src/main/assets/MathJax/localization/cs/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/cs/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/cs/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/cs/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/cs/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/cs/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/cs/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/cs/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/cs/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/cs/MathML.js b/SWADroid/src/main/assets/MathJax/localization/cs/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/cs/MathML.js diff --git a/app/src/main/assets/MathJax/localization/cs/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/cs/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/cs/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/cs/TeX.js b/SWADroid/src/main/assets/MathJax/localization/cs/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/cs/TeX.js diff --git a/app/src/main/assets/MathJax/localization/cs/cs.js b/SWADroid/src/main/assets/MathJax/localization/cs/cs.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cs/cs.js rename to SWADroid/src/main/assets/MathJax/localization/cs/cs.js diff --git a/app/src/main/assets/MathJax/localization/cy/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/cy/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/cy/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/cy/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/cy/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/cy/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/cy/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/cy/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/cy/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/cy/MathML.js b/SWADroid/src/main/assets/MathJax/localization/cy/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/cy/MathML.js diff --git a/app/src/main/assets/MathJax/localization/cy/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/cy/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/cy/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/cy/TeX.js b/SWADroid/src/main/assets/MathJax/localization/cy/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/cy/TeX.js diff --git a/app/src/main/assets/MathJax/localization/cy/cy.js b/SWADroid/src/main/assets/MathJax/localization/cy/cy.js similarity index 100% rename from app/src/main/assets/MathJax/localization/cy/cy.js rename to SWADroid/src/main/assets/MathJax/localization/cy/cy.js diff --git a/app/src/main/assets/MathJax/localization/da/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/da/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/da/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/da/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/da/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/da/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/da/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/da/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/da/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/da/MathML.js b/SWADroid/src/main/assets/MathJax/localization/da/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/da/MathML.js diff --git a/app/src/main/assets/MathJax/localization/da/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/da/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/da/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/da/TeX.js b/SWADroid/src/main/assets/MathJax/localization/da/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/da/TeX.js diff --git a/app/src/main/assets/MathJax/localization/da/da.js b/SWADroid/src/main/assets/MathJax/localization/da/da.js similarity index 100% rename from app/src/main/assets/MathJax/localization/da/da.js rename to SWADroid/src/main/assets/MathJax/localization/da/da.js diff --git a/app/src/main/assets/MathJax/localization/de/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/de/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/de/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/de/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/de/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/de/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/de/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/de/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/de/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/de/MathML.js b/SWADroid/src/main/assets/MathJax/localization/de/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/de/MathML.js diff --git a/app/src/main/assets/MathJax/localization/de/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/de/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/de/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/de/TeX.js b/SWADroid/src/main/assets/MathJax/localization/de/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/de/TeX.js diff --git a/app/src/main/assets/MathJax/localization/de/de.js b/SWADroid/src/main/assets/MathJax/localization/de/de.js similarity index 100% rename from app/src/main/assets/MathJax/localization/de/de.js rename to SWADroid/src/main/assets/MathJax/localization/de/de.js diff --git a/app/src/main/assets/MathJax/localization/en/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/en/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/en/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/en/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/en/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/en/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/en/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/en/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/en/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/en/MathML.js b/SWADroid/src/main/assets/MathJax/localization/en/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/en/MathML.js diff --git a/app/src/main/assets/MathJax/localization/en/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/en/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/en/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/en/TeX.js b/SWADroid/src/main/assets/MathJax/localization/en/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/en/TeX.js diff --git a/app/src/main/assets/MathJax/localization/en/en.js b/SWADroid/src/main/assets/MathJax/localization/en/en.js similarity index 100% rename from app/src/main/assets/MathJax/localization/en/en.js rename to SWADroid/src/main/assets/MathJax/localization/en/en.js diff --git a/app/src/main/assets/MathJax/localization/eo/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/eo/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/eo/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/eo/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/eo/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/eo/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/eo/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/eo/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/eo/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/eo/MathML.js b/SWADroid/src/main/assets/MathJax/localization/eo/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/eo/MathML.js diff --git a/app/src/main/assets/MathJax/localization/eo/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/eo/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/eo/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/eo/TeX.js b/SWADroid/src/main/assets/MathJax/localization/eo/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/eo/TeX.js diff --git a/app/src/main/assets/MathJax/localization/eo/eo.js b/SWADroid/src/main/assets/MathJax/localization/eo/eo.js similarity index 100% rename from app/src/main/assets/MathJax/localization/eo/eo.js rename to SWADroid/src/main/assets/MathJax/localization/eo/eo.js diff --git a/app/src/main/assets/MathJax/localization/es/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/es/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/es/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/es/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/es/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/es/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/es/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/es/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/es/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/es/MathML.js b/SWADroid/src/main/assets/MathJax/localization/es/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/es/MathML.js diff --git a/app/src/main/assets/MathJax/localization/es/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/es/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/es/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/es/TeX.js b/SWADroid/src/main/assets/MathJax/localization/es/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/es/TeX.js diff --git a/app/src/main/assets/MathJax/localization/es/es.js b/SWADroid/src/main/assets/MathJax/localization/es/es.js similarity index 100% rename from app/src/main/assets/MathJax/localization/es/es.js rename to SWADroid/src/main/assets/MathJax/localization/es/es.js diff --git a/app/src/main/assets/MathJax/localization/fa/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/fa/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/fa/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/fa/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/fa/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/fa/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/fa/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/fa/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/fa/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/fa/MathML.js b/SWADroid/src/main/assets/MathJax/localization/fa/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/fa/MathML.js diff --git a/app/src/main/assets/MathJax/localization/fa/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/fa/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/fa/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/fa/TeX.js b/SWADroid/src/main/assets/MathJax/localization/fa/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/fa/TeX.js diff --git a/app/src/main/assets/MathJax/localization/fa/fa.js b/SWADroid/src/main/assets/MathJax/localization/fa/fa.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fa/fa.js rename to SWADroid/src/main/assets/MathJax/localization/fa/fa.js diff --git a/app/src/main/assets/MathJax/localization/fi/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/fi/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/fi/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/fi/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/fi/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/fi/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/fi/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/fi/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/fi/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/fi/MathML.js b/SWADroid/src/main/assets/MathJax/localization/fi/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/fi/MathML.js diff --git a/app/src/main/assets/MathJax/localization/fi/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/fi/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/fi/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/fi/TeX.js b/SWADroid/src/main/assets/MathJax/localization/fi/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/fi/TeX.js diff --git a/app/src/main/assets/MathJax/localization/fi/fi.js b/SWADroid/src/main/assets/MathJax/localization/fi/fi.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fi/fi.js rename to SWADroid/src/main/assets/MathJax/localization/fi/fi.js diff --git a/app/src/main/assets/MathJax/localization/fr/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/fr/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/fr/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/fr/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/fr/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/fr/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/fr/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/fr/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/fr/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/fr/MathML.js b/SWADroid/src/main/assets/MathJax/localization/fr/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/fr/MathML.js diff --git a/app/src/main/assets/MathJax/localization/fr/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/fr/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/fr/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/fr/TeX.js b/SWADroid/src/main/assets/MathJax/localization/fr/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/fr/TeX.js diff --git a/app/src/main/assets/MathJax/localization/fr/fr.js b/SWADroid/src/main/assets/MathJax/localization/fr/fr.js similarity index 100% rename from app/src/main/assets/MathJax/localization/fr/fr.js rename to SWADroid/src/main/assets/MathJax/localization/fr/fr.js diff --git a/app/src/main/assets/MathJax/localization/gl/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/gl/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/gl/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/gl/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/gl/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/gl/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/gl/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/gl/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/gl/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/gl/MathML.js b/SWADroid/src/main/assets/MathJax/localization/gl/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/gl/MathML.js diff --git a/app/src/main/assets/MathJax/localization/gl/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/gl/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/gl/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/gl/TeX.js b/SWADroid/src/main/assets/MathJax/localization/gl/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/gl/TeX.js diff --git a/app/src/main/assets/MathJax/localization/gl/gl.js b/SWADroid/src/main/assets/MathJax/localization/gl/gl.js similarity index 100% rename from app/src/main/assets/MathJax/localization/gl/gl.js rename to SWADroid/src/main/assets/MathJax/localization/gl/gl.js diff --git a/app/src/main/assets/MathJax/localization/he/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/he/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/he/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/he/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/he/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/he/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/he/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/he/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/he/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/he/MathML.js b/SWADroid/src/main/assets/MathJax/localization/he/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/he/MathML.js diff --git a/app/src/main/assets/MathJax/localization/he/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/he/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/he/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/he/TeX.js b/SWADroid/src/main/assets/MathJax/localization/he/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/he/TeX.js diff --git a/app/src/main/assets/MathJax/localization/he/he.js b/SWADroid/src/main/assets/MathJax/localization/he/he.js similarity index 100% rename from app/src/main/assets/MathJax/localization/he/he.js rename to SWADroid/src/main/assets/MathJax/localization/he/he.js diff --git a/app/src/main/assets/MathJax/localization/ia/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ia/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ia/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ia/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ia/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ia/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ia/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ia/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ia/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ia/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ia/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ia/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ia/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ia/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ia/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ia/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ia/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ia/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ia/ia.js b/SWADroid/src/main/assets/MathJax/localization/ia/ia.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ia/ia.js rename to SWADroid/src/main/assets/MathJax/localization/ia/ia.js diff --git a/app/src/main/assets/MathJax/localization/it/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/it/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/it/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/it/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/it/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/it/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/it/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/it/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/it/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/it/MathML.js b/SWADroid/src/main/assets/MathJax/localization/it/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/it/MathML.js diff --git a/app/src/main/assets/MathJax/localization/it/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/it/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/it/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/it/TeX.js b/SWADroid/src/main/assets/MathJax/localization/it/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/it/TeX.js diff --git a/app/src/main/assets/MathJax/localization/it/it.js b/SWADroid/src/main/assets/MathJax/localization/it/it.js similarity index 100% rename from app/src/main/assets/MathJax/localization/it/it.js rename to SWADroid/src/main/assets/MathJax/localization/it/it.js diff --git a/app/src/main/assets/MathJax/localization/ja/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ja/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ja/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ja/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ja/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ja/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ja/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ja/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ja/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ja/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ja/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ja/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ja/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ja/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ja/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ja/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ja/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ja/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ja/ja.js b/SWADroid/src/main/assets/MathJax/localization/ja/ja.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ja/ja.js rename to SWADroid/src/main/assets/MathJax/localization/ja/ja.js diff --git a/app/src/main/assets/MathJax/localization/kn/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/kn/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/kn/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/kn/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/kn/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/kn/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/kn/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/kn/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/kn/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/kn/MathML.js b/SWADroid/src/main/assets/MathJax/localization/kn/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/kn/MathML.js diff --git a/app/src/main/assets/MathJax/localization/kn/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/kn/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/kn/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/kn/TeX.js b/SWADroid/src/main/assets/MathJax/localization/kn/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/kn/TeX.js diff --git a/app/src/main/assets/MathJax/localization/kn/kn.js b/SWADroid/src/main/assets/MathJax/localization/kn/kn.js similarity index 100% rename from app/src/main/assets/MathJax/localization/kn/kn.js rename to SWADroid/src/main/assets/MathJax/localization/kn/kn.js diff --git a/app/src/main/assets/MathJax/localization/ko/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ko/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ko/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ko/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ko/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ko/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ko/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ko/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ko/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ko/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ko/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ko/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ko/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ko/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ko/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ko/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ko/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ko/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ko/ko.js b/SWADroid/src/main/assets/MathJax/localization/ko/ko.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ko/ko.js rename to SWADroid/src/main/assets/MathJax/localization/ko/ko.js diff --git a/app/src/main/assets/MathJax/localization/lb/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/lb/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/lb/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/lb/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/lb/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/lb/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/lb/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/lb/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/lb/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/lb/MathML.js b/SWADroid/src/main/assets/MathJax/localization/lb/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/lb/MathML.js diff --git a/app/src/main/assets/MathJax/localization/lb/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/lb/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/lb/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/lb/TeX.js b/SWADroid/src/main/assets/MathJax/localization/lb/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/lb/TeX.js diff --git a/app/src/main/assets/MathJax/localization/lb/lb.js b/SWADroid/src/main/assets/MathJax/localization/lb/lb.js similarity index 100% rename from app/src/main/assets/MathJax/localization/lb/lb.js rename to SWADroid/src/main/assets/MathJax/localization/lb/lb.js diff --git a/app/src/main/assets/MathJax/localization/mk/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/mk/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/mk/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/mk/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/mk/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/mk/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/mk/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/mk/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/mk/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/mk/MathML.js b/SWADroid/src/main/assets/MathJax/localization/mk/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/mk/MathML.js diff --git a/app/src/main/assets/MathJax/localization/mk/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/mk/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/mk/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/mk/TeX.js b/SWADroid/src/main/assets/MathJax/localization/mk/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/mk/TeX.js diff --git a/app/src/main/assets/MathJax/localization/mk/mk.js b/SWADroid/src/main/assets/MathJax/localization/mk/mk.js similarity index 100% rename from app/src/main/assets/MathJax/localization/mk/mk.js rename to SWADroid/src/main/assets/MathJax/localization/mk/mk.js diff --git a/app/src/main/assets/MathJax/localization/nl/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/nl/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/nl/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/nl/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/nl/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/nl/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/nl/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/nl/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/nl/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/nl/MathML.js b/SWADroid/src/main/assets/MathJax/localization/nl/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/nl/MathML.js diff --git a/app/src/main/assets/MathJax/localization/nl/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/nl/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/nl/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/nl/TeX.js b/SWADroid/src/main/assets/MathJax/localization/nl/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/nl/TeX.js diff --git a/app/src/main/assets/MathJax/localization/nl/nl.js b/SWADroid/src/main/assets/MathJax/localization/nl/nl.js similarity index 100% rename from app/src/main/assets/MathJax/localization/nl/nl.js rename to SWADroid/src/main/assets/MathJax/localization/nl/nl.js diff --git a/app/src/main/assets/MathJax/localization/oc/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/oc/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/oc/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/oc/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/oc/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/oc/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/oc/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/oc/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/oc/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/oc/MathML.js b/SWADroid/src/main/assets/MathJax/localization/oc/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/oc/MathML.js diff --git a/app/src/main/assets/MathJax/localization/oc/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/oc/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/oc/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/oc/TeX.js b/SWADroid/src/main/assets/MathJax/localization/oc/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/oc/TeX.js diff --git a/app/src/main/assets/MathJax/localization/oc/oc.js b/SWADroid/src/main/assets/MathJax/localization/oc/oc.js similarity index 100% rename from app/src/main/assets/MathJax/localization/oc/oc.js rename to SWADroid/src/main/assets/MathJax/localization/oc/oc.js diff --git a/app/src/main/assets/MathJax/localization/pl/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/pl/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/pl/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/pl/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/pl/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/pl/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/pl/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/pl/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/pl/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/pl/MathML.js b/SWADroid/src/main/assets/MathJax/localization/pl/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/pl/MathML.js diff --git a/app/src/main/assets/MathJax/localization/pl/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/pl/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/pl/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/pl/TeX.js b/SWADroid/src/main/assets/MathJax/localization/pl/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/pl/TeX.js diff --git a/app/src/main/assets/MathJax/localization/pl/pl.js b/SWADroid/src/main/assets/MathJax/localization/pl/pl.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pl/pl.js rename to SWADroid/src/main/assets/MathJax/localization/pl/pl.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/MathML.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/MathML.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/TeX.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/TeX.js diff --git a/app/src/main/assets/MathJax/localization/pt-br/pt-br.js b/SWADroid/src/main/assets/MathJax/localization/pt-br/pt-br.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt-br/pt-br.js rename to SWADroid/src/main/assets/MathJax/localization/pt-br/pt-br.js diff --git a/app/src/main/assets/MathJax/localization/pt/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/pt/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/pt/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/pt/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/pt/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/pt/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/pt/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/pt/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/pt/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/pt/MathML.js b/SWADroid/src/main/assets/MathJax/localization/pt/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/pt/MathML.js diff --git a/app/src/main/assets/MathJax/localization/pt/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/pt/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/pt/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/pt/TeX.js b/SWADroid/src/main/assets/MathJax/localization/pt/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/pt/TeX.js diff --git a/app/src/main/assets/MathJax/localization/pt/pt.js b/SWADroid/src/main/assets/MathJax/localization/pt/pt.js similarity index 100% rename from app/src/main/assets/MathJax/localization/pt/pt.js rename to SWADroid/src/main/assets/MathJax/localization/pt/pt.js diff --git a/app/src/main/assets/MathJax/localization/qqq/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/qqq/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/qqq/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/qqq/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/qqq/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/qqq/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/qqq/MathML.js b/SWADroid/src/main/assets/MathJax/localization/qqq/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/MathML.js diff --git a/app/src/main/assets/MathJax/localization/qqq/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/qqq/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/qqq/TeX.js b/SWADroid/src/main/assets/MathJax/localization/qqq/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/TeX.js diff --git a/app/src/main/assets/MathJax/localization/qqq/qqq.js b/SWADroid/src/main/assets/MathJax/localization/qqq/qqq.js similarity index 100% rename from app/src/main/assets/MathJax/localization/qqq/qqq.js rename to SWADroid/src/main/assets/MathJax/localization/qqq/qqq.js diff --git a/app/src/main/assets/MathJax/localization/ru/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/ru/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/ru/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/ru/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/ru/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/ru/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/ru/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/ru/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/ru/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/ru/MathML.js b/SWADroid/src/main/assets/MathJax/localization/ru/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/ru/MathML.js diff --git a/app/src/main/assets/MathJax/localization/ru/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/ru/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/ru/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/ru/TeX.js b/SWADroid/src/main/assets/MathJax/localization/ru/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/ru/TeX.js diff --git a/app/src/main/assets/MathJax/localization/ru/ru.js b/SWADroid/src/main/assets/MathJax/localization/ru/ru.js similarity index 100% rename from app/src/main/assets/MathJax/localization/ru/ru.js rename to SWADroid/src/main/assets/MathJax/localization/ru/ru.js diff --git a/app/src/main/assets/MathJax/localization/sco/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/sco/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/sco/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/sco/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/sco/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/sco/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/sco/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/sco/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/sco/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/sco/MathML.js b/SWADroid/src/main/assets/MathJax/localization/sco/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/sco/MathML.js diff --git a/app/src/main/assets/MathJax/localization/sco/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/sco/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/sco/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/sco/TeX.js b/SWADroid/src/main/assets/MathJax/localization/sco/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/sco/TeX.js diff --git a/app/src/main/assets/MathJax/localization/sco/sco.js b/SWADroid/src/main/assets/MathJax/localization/sco/sco.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sco/sco.js rename to SWADroid/src/main/assets/MathJax/localization/sco/sco.js diff --git a/app/src/main/assets/MathJax/localization/sl/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/sl/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/sl/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/sl/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/sl/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/sl/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/sl/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/sl/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/sl/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/sl/MathML.js b/SWADroid/src/main/assets/MathJax/localization/sl/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/sl/MathML.js diff --git a/app/src/main/assets/MathJax/localization/sl/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/sl/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/sl/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/sl/TeX.js b/SWADroid/src/main/assets/MathJax/localization/sl/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/sl/TeX.js diff --git a/app/src/main/assets/MathJax/localization/sl/sl.js b/SWADroid/src/main/assets/MathJax/localization/sl/sl.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sl/sl.js rename to SWADroid/src/main/assets/MathJax/localization/sl/sl.js diff --git a/app/src/main/assets/MathJax/localization/sv/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/sv/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/sv/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/sv/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/sv/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/sv/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/sv/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/sv/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/sv/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/sv/MathML.js b/SWADroid/src/main/assets/MathJax/localization/sv/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/sv/MathML.js diff --git a/app/src/main/assets/MathJax/localization/sv/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/sv/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/sv/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/sv/TeX.js b/SWADroid/src/main/assets/MathJax/localization/sv/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/sv/TeX.js diff --git a/app/src/main/assets/MathJax/localization/sv/sv.js b/SWADroid/src/main/assets/MathJax/localization/sv/sv.js similarity index 100% rename from app/src/main/assets/MathJax/localization/sv/sv.js rename to SWADroid/src/main/assets/MathJax/localization/sv/sv.js diff --git a/app/src/main/assets/MathJax/localization/tr/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/tr/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/tr/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/tr/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/tr/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/tr/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/tr/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/tr/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/tr/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/tr/MathML.js b/SWADroid/src/main/assets/MathJax/localization/tr/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/tr/MathML.js diff --git a/app/src/main/assets/MathJax/localization/tr/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/tr/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/tr/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/tr/TeX.js b/SWADroid/src/main/assets/MathJax/localization/tr/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/tr/TeX.js diff --git a/app/src/main/assets/MathJax/localization/tr/tr.js b/SWADroid/src/main/assets/MathJax/localization/tr/tr.js similarity index 100% rename from app/src/main/assets/MathJax/localization/tr/tr.js rename to SWADroid/src/main/assets/MathJax/localization/tr/tr.js diff --git a/app/src/main/assets/MathJax/localization/uk/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/uk/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/uk/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/uk/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/uk/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/uk/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/uk/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/uk/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/uk/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/uk/MathML.js b/SWADroid/src/main/assets/MathJax/localization/uk/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/uk/MathML.js diff --git a/app/src/main/assets/MathJax/localization/uk/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/uk/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/uk/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/uk/TeX.js b/SWADroid/src/main/assets/MathJax/localization/uk/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/uk/TeX.js diff --git a/app/src/main/assets/MathJax/localization/uk/uk.js b/SWADroid/src/main/assets/MathJax/localization/uk/uk.js similarity index 100% rename from app/src/main/assets/MathJax/localization/uk/uk.js rename to SWADroid/src/main/assets/MathJax/localization/uk/uk.js diff --git a/app/src/main/assets/MathJax/localization/vi/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/vi/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/vi/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/vi/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/vi/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/vi/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/vi/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/vi/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/vi/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/vi/MathML.js b/SWADroid/src/main/assets/MathJax/localization/vi/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/vi/MathML.js diff --git a/app/src/main/assets/MathJax/localization/vi/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/vi/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/vi/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/vi/TeX.js b/SWADroid/src/main/assets/MathJax/localization/vi/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/vi/TeX.js diff --git a/app/src/main/assets/MathJax/localization/vi/vi.js b/SWADroid/src/main/assets/MathJax/localization/vi/vi.js similarity index 100% rename from app/src/main/assets/MathJax/localization/vi/vi.js rename to SWADroid/src/main/assets/MathJax/localization/vi/vi.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/FontWarnings.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/FontWarnings.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/FontWarnings.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/FontWarnings.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/HTML-CSS.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/HTML-CSS.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/HTML-CSS.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/HTML-CSS.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/HelpDialog.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/HelpDialog.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/HelpDialog.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/HelpDialog.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/MathML.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/MathML.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/MathML.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/MathML.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/MathMenu.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/MathMenu.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/MathMenu.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/MathMenu.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/TeX.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/TeX.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/TeX.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/TeX.js diff --git a/app/src/main/assets/MathJax/localization/zh-hans/zh-hans.js b/SWADroid/src/main/assets/MathJax/localization/zh-hans/zh-hans.js similarity index 100% rename from app/src/main/assets/MathJax/localization/zh-hans/zh-hans.js rename to SWADroid/src/main/assets/MathJax/localization/zh-hans/zh-hans.js diff --git a/app/src/main/java/com/android/dataframework/DataFramework.java b/SWADroid/src/main/java/com/android/dataframework/DataFramework.java similarity index 100% rename from app/src/main/java/com/android/dataframework/DataFramework.java rename to SWADroid/src/main/java/com/android/dataframework/DataFramework.java diff --git a/app/src/main/java/com/android/dataframework/Entity.java b/SWADroid/src/main/java/com/android/dataframework/Entity.java similarity index 100% rename from app/src/main/java/com/android/dataframework/Entity.java rename to SWADroid/src/main/java/com/android/dataframework/Entity.java diff --git a/app/src/main/java/com/android/dataframework/EntityCursor.java b/SWADroid/src/main/java/com/android/dataframework/EntityCursor.java similarity index 100% rename from app/src/main/java/com/android/dataframework/EntityCursor.java rename to SWADroid/src/main/java/com/android/dataframework/EntityCursor.java diff --git a/app/src/main/java/com/android/dataframework/EntityEditActivity.java b/SWADroid/src/main/java/com/android/dataframework/EntityEditActivity.java similarity index 100% rename from app/src/main/java/com/android/dataframework/EntityEditActivity.java rename to SWADroid/src/main/java/com/android/dataframework/EntityEditActivity.java diff --git a/app/src/main/java/com/android/dataframework/core/DataFrameworkCore.java b/SWADroid/src/main/java/com/android/dataframework/core/DataFrameworkCore.java similarity index 100% rename from app/src/main/java/com/android/dataframework/core/DataFrameworkCore.java rename to SWADroid/src/main/java/com/android/dataframework/core/DataFrameworkCore.java diff --git a/app/src/main/java/com/android/dataframework/core/Field.java b/SWADroid/src/main/java/com/android/dataframework/core/Field.java similarity index 100% rename from app/src/main/java/com/android/dataframework/core/Field.java rename to SWADroid/src/main/java/com/android/dataframework/core/Field.java diff --git a/app/src/main/java/com/android/dataframework/core/Table.java b/SWADroid/src/main/java/com/android/dataframework/core/Table.java similarity index 100% rename from app/src/main/java/com/android/dataframework/core/Table.java rename to SWADroid/src/main/java/com/android/dataframework/core/Table.java diff --git a/app/src/main/java/com/google/zxing/client/android/BeepManager.java b/SWADroid/src/main/java/com/google/zxing/client/android/BeepManager.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/BeepManager.java rename to SWADroid/src/main/java/com/google/zxing/client/android/BeepManager.java diff --git a/app/src/main/java/com/google/zxing/client/android/CaptureActivity.java b/SWADroid/src/main/java/com/google/zxing/client/android/CaptureActivity.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/CaptureActivity.java rename to SWADroid/src/main/java/com/google/zxing/client/android/CaptureActivity.java diff --git a/app/src/main/java/com/google/zxing/client/android/CaptureActivityHandler.java b/SWADroid/src/main/java/com/google/zxing/client/android/CaptureActivityHandler.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/CaptureActivityHandler.java rename to SWADroid/src/main/java/com/google/zxing/client/android/CaptureActivityHandler.java diff --git a/app/src/main/java/com/google/zxing/client/android/Contents.java b/SWADroid/src/main/java/com/google/zxing/client/android/Contents.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/Contents.java rename to SWADroid/src/main/java/com/google/zxing/client/android/Contents.java diff --git a/app/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java b/SWADroid/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java rename to SWADroid/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java diff --git a/app/src/main/java/com/google/zxing/client/android/DecodeHandler.java b/SWADroid/src/main/java/com/google/zxing/client/android/DecodeHandler.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/DecodeHandler.java rename to SWADroid/src/main/java/com/google/zxing/client/android/DecodeHandler.java diff --git a/app/src/main/java/com/google/zxing/client/android/DecodeThread.java b/SWADroid/src/main/java/com/google/zxing/client/android/DecodeThread.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/DecodeThread.java rename to SWADroid/src/main/java/com/google/zxing/client/android/DecodeThread.java diff --git a/app/src/main/java/com/google/zxing/client/android/FinishListener.java b/SWADroid/src/main/java/com/google/zxing/client/android/FinishListener.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/FinishListener.java rename to SWADroid/src/main/java/com/google/zxing/client/android/FinishListener.java diff --git a/app/src/main/java/com/google/zxing/client/android/InactivityTimer.java b/SWADroid/src/main/java/com/google/zxing/client/android/InactivityTimer.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/InactivityTimer.java rename to SWADroid/src/main/java/com/google/zxing/client/android/InactivityTimer.java diff --git a/app/src/main/java/com/google/zxing/client/android/IntentSource.java b/SWADroid/src/main/java/com/google/zxing/client/android/IntentSource.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/IntentSource.java rename to SWADroid/src/main/java/com/google/zxing/client/android/IntentSource.java diff --git a/app/src/main/java/com/google/zxing/client/android/Intents.java b/SWADroid/src/main/java/com/google/zxing/client/android/Intents.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/Intents.java rename to SWADroid/src/main/java/com/google/zxing/client/android/Intents.java diff --git a/app/src/main/java/com/google/zxing/client/android/PlanarYUVLuminanceSource.java b/SWADroid/src/main/java/com/google/zxing/client/android/PlanarYUVLuminanceSource.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/PlanarYUVLuminanceSource.java rename to SWADroid/src/main/java/com/google/zxing/client/android/PlanarYUVLuminanceSource.java diff --git a/app/src/main/java/com/google/zxing/client/android/PreferencesActivity.java b/SWADroid/src/main/java/com/google/zxing/client/android/PreferencesActivity.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/PreferencesActivity.java rename to SWADroid/src/main/java/com/google/zxing/client/android/PreferencesActivity.java diff --git a/app/src/main/java/com/google/zxing/client/android/ViewfinderResultPointCallback.java b/SWADroid/src/main/java/com/google/zxing/client/android/ViewfinderResultPointCallback.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/ViewfinderResultPointCallback.java rename to SWADroid/src/main/java/com/google/zxing/client/android/ViewfinderResultPointCallback.java diff --git a/app/src/main/java/com/google/zxing/client/android/ViewfinderView.java b/SWADroid/src/main/java/com/google/zxing/client/android/ViewfinderView.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/ViewfinderView.java rename to SWADroid/src/main/java/com/google/zxing/client/android/ViewfinderView.java diff --git a/app/src/main/java/com/google/zxing/client/android/camera/AutoFocusCallback.java b/SWADroid/src/main/java/com/google/zxing/client/android/camera/AutoFocusCallback.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/camera/AutoFocusCallback.java rename to SWADroid/src/main/java/com/google/zxing/client/android/camera/AutoFocusCallback.java diff --git a/app/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/SWADroid/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java rename to SWADroid/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java diff --git a/app/src/main/java/com/google/zxing/client/android/camera/CameraManager.java b/SWADroid/src/main/java/com/google/zxing/client/android/camera/CameraManager.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/camera/CameraManager.java rename to SWADroid/src/main/java/com/google/zxing/client/android/camera/CameraManager.java diff --git a/app/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java b/SWADroid/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java rename to SWADroid/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java diff --git a/app/src/main/java/com/google/zxing/client/android/encode/ContactEncoder.java b/SWADroid/src/main/java/com/google/zxing/client/android/encode/ContactEncoder.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/encode/ContactEncoder.java rename to SWADroid/src/main/java/com/google/zxing/client/android/encode/ContactEncoder.java diff --git a/app/src/main/java/com/google/zxing/client/android/encode/Formatter.java b/SWADroid/src/main/java/com/google/zxing/client/android/encode/Formatter.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/encode/Formatter.java rename to SWADroid/src/main/java/com/google/zxing/client/android/encode/Formatter.java diff --git a/app/src/main/java/com/google/zxing/client/android/encode/MECARDContactEncoder.java b/SWADroid/src/main/java/com/google/zxing/client/android/encode/MECARDContactEncoder.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/encode/MECARDContactEncoder.java rename to SWADroid/src/main/java/com/google/zxing/client/android/encode/MECARDContactEncoder.java diff --git a/app/src/main/java/com/google/zxing/client/android/encode/QRCodeEncoder.java b/SWADroid/src/main/java/com/google/zxing/client/android/encode/QRCodeEncoder.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/encode/QRCodeEncoder.java rename to SWADroid/src/main/java/com/google/zxing/client/android/encode/QRCodeEncoder.java diff --git a/app/src/main/java/com/google/zxing/client/android/encode/VCardContactEncoder.java b/SWADroid/src/main/java/com/google/zxing/client/android/encode/VCardContactEncoder.java similarity index 100% rename from app/src/main/java/com/google/zxing/client/android/encode/VCardContactEncoder.java rename to SWADroid/src/main/java/com/google/zxing/client/android/encode/VCardContactEncoder.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/.gitignore b/SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/.gitignore rename to SWADroid/src/main/java/es/ugr/swad/swadroid/.gitignore diff --git a/app/src/main/java/es/ugr/swad/swadroid/Constants.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/Constants.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java index 799593601..91d72984a 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/Constants.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java @@ -37,10 +37,18 @@ public class Constants { * @deprecated Use {@link Config#SWAD_APP_KEY} instead */ public static final String SWAD_APP_KEY = Config.SWAD_APP_KEY; + /** + * URL of SWAD UGR Server + */ + public static final String SWAD_UGR_SERVER = "swad.ugr.es"; + /** + * URL of OpenSWAD Server + */ + public static final String OPENSWAD_SERVER = "openswad.org"; /** * Server URL */ - public static final String DEFAULT_SERVER = "swad.ugr.es"; + public static final String DEFAULT_SERVER = SWAD_UGR_SERVER; /** * Account type */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/SWADMain.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java index 02a8bebe9..bcb143703 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/SWADMain.java @@ -52,23 +52,26 @@ import java.util.List; import java.util.Map; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.gui.ImageExpandableListAdapter; import es.ugr.swad.swadroid.gui.MenuExpandableListActivity; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.Model; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.GenerateQR; -import es.ugr.swad.swadroid.modules.Login; -import es.ugr.swad.swadroid.modules.Notices; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.qr.GenerateQR; +import es.ugr.swad.swadroid.modules.login.Login; +import es.ugr.swad.swadroid.modules.notices.Notices; import es.ugr.swad.swadroid.modules.downloads.DownloadsManager; import es.ugr.swad.swadroid.modules.groups.MyGroupsManager; import es.ugr.swad.swadroid.modules.information.Information; +import es.ugr.swad.swadroid.modules.login.LoginActivity; import es.ugr.swad.swadroid.modules.messages.Messages; import es.ugr.swad.swadroid.modules.notifications.Notifications; import es.ugr.swad.swadroid.modules.rollcall.Rollcall; import es.ugr.swad.swadroid.modules.tests.Tests; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.ssl.SecureConnection; import es.ugr.swad.swadroid.sync.AccountAuthenticator; import es.ugr.swad.swadroid.sync.SyncUtils; diff --git a/app/src/main/java/es/ugr/swad/swadroid/SWADroidTracker.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/SWADroidTracker.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/SWADroidTracker.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/SWADroidTracker.java index 0d6c06798..66641ac68 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/SWADroidTracker.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/SWADroidTracker.java @@ -19,7 +19,7 @@ * */ -package es.ugr.swad.swadroid; +package es.ugr.swad.swadroid.analytics; import android.content.Context; import android.util.Log; @@ -32,6 +32,9 @@ import java.util.HashMap; +import es.ugr.swad.swadroid.Config; +import es.ugr.swad.swadroid.Constants; + /** * Tracker for Google Play * diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/package.html new file mode 100644 index 000000000..45e129831 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/analytics/package.html @@ -0,0 +1,7 @@ + + + + +Analytics package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java index 6210a1998..7f2166ddf 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelper.java @@ -37,8 +37,8 @@ import java.util.List; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.preferences.Preferences; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.Event; import es.ugr.swad.swadroid.model.Group; diff --git a/app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelperException.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelperException.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelperException.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/database/DataBaseHelperException.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/database/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/database/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/database/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/database/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java index f0cffeea7..e2b01fed4 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java @@ -26,7 +26,7 @@ import android.graphics.BitmapFactory; import android.support.v4.app.NotificationCompat; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; /** * Class for create notification alerts. diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java index 35061b5a5..57ac07aa5 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/DialogFactory.java @@ -22,7 +22,7 @@ import java.io.InputStream; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; /** * Class for create dialogs. diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/ImageExpandableListAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageExpandableListAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/ImageExpandableListAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageExpandableListAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/ImageFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageFactory.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/ImageFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageFactory.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/ImageListAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageListAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/ImageListAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageListAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/ImageListItem.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageListItem.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/ImageListItem.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/ImageListItem.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java index 187454f7e..87ce3f3ff 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java @@ -33,8 +33,8 @@ import android.widget.Toast; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; -import es.ugr.swad.swadroid.PreferencesActivity; +import es.ugr.swad.swadroid.preferences.Preferences; +import es.ugr.swad.swadroid.preferences.PreferencesActivity; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.database.DataBaseHelper; diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java index a540d4b6f..ef3764ea7 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java @@ -33,8 +33,8 @@ import android.widget.Toast; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; -import es.ugr.swad.swadroid.PreferencesActivity; +import es.ugr.swad.swadroid.preferences.Preferences; +import es.ugr.swad.swadroid.preferences.PreferencesActivity; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.SWADMain; import es.ugr.swad.swadroid.database.DataBaseHelper; diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/WebViewFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/WebViewFactory.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/WebViewFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/WebViewFactory.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/CheckableLinearLayout.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/CheckableLinearLayout.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/CheckableLinearLayout.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/CheckableLinearLayout.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/ExpandedListView.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/ExpandedListView.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/ExpandedListView.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/ExpandedListView.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPicker.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPicker.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPicker.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPicker.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPickerButton.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPickerButton.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPickerButton.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/NumberPickerButton.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/SeekBarDialogPreference.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/SeekBarDialogPreference.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/SeekBarDialogPreference.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/SeekBarDialogPreference.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/TextProgressBar.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/TextProgressBar.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/TextProgressBar.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/TextProgressBar.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/gui/widget/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/gui/widget/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/gui/widget/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Course.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Course.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/Course.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Course.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Event.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Event.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/Event.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Event.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Group.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Group.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/Group.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Group.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/GroupType.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/GroupType.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/GroupType.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/GroupType.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Model.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Model.java similarity index 94% rename from app/src/main/java/es/ugr/swad/swadroid/model/Model.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Model.java index 08db22e62..dcc47bf86 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/model/Model.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Model.java @@ -87,14 +87,4 @@ public boolean equals(Object obj) { public String toString() { return "Model [id=" + id + "]"; } - - @Override - public String getInnerText() { - return null; - } - - @Override - public void setInnerText(String s) { - - } } diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Pair.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Pair.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/Pair.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Pair.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/PairTable.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/PairTable.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/PairTable.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/PairTable.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/SWADNotification.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/SWADNotification.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/SWADNotification.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/SWADNotification.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/Test.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/Test.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/Test.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/Test.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/TestAnswer.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestAnswer.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/TestAnswer.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestAnswer.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/TestQuestion.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestQuestion.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/TestQuestion.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestQuestion.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/TestTag.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestTag.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/TestTag.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/TestTag.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/User.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/User.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/User.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/UserAttendance.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/UserAttendance.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/UserAttendance.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/UserAttendance.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/model/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/model/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/model/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/model/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/Module.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/Module.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/Module.java index 9ea144f4b..f53a56537 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Module.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/Module.java @@ -44,9 +44,10 @@ import javax.net.ssl.SSLException; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.gui.MenuActivity; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.IWebserviceClient; import es.ugr.swad.swadroid.webservices.SOAPClient; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java index 0b3386f71..1ad413e8f 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccount.java @@ -32,6 +32,7 @@ /** * Module for create a new account + * @see createAccount * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java similarity index 69% rename from app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java index de12164ef..d215b1ccd 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java @@ -19,25 +19,32 @@ import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; import android.app.Activity; +import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.text.TextUtils; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import java.util.Arrays; +import java.util.List; + import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.utils.Utils; @@ -48,10 +55,12 @@ * @author Juan Miguel Boyero Corral * */ -public class CreateAccountActivity extends AppCompatActivity { +public class CreateAccountActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener { public static final String TAG = Constants.APP_TAG + " CreateAccountActivity"; + private static List serversList; + private boolean mLoginError = false; // UI references for the create account form. @@ -61,8 +70,9 @@ public class CreateAccountActivity extends AppCompatActivity { private EditText mNicknameView; private EditText mEmailView; private EditText mPasswordView; - private EditText mServerView; - private Button mCreateAccountButton; + private EditText mServerTextView; + private Spinner mServerView; + private ArrayAdapter serverAdapter; @Override protected void onCreate(Bundle savedInstanceState) { @@ -70,14 +80,29 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.create_account_activity); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + + serversList = Arrays.asList(getResources().getStringArray(R.array.servers_array)); + setupCreateAccountForm(); } + @Override + protected void onResume() { + super.onResume(); + + if(!mServerView.getSelectedItem().equals(Preferences.getServer())) { + setSelectedServer(Preferences.getServer()); + } + } + private void setupCreateAccountForm() { mLoginFormView = findViewById(R.id.login_form); mLoginStatusView = findViewById(R.id.login_status); - mCreateAccountButton = (Button) findViewById(R.id.create_account_button); + Button mCreateAccountButton = (Button) findViewById(R.id.create_account_button); mNicknameView = (EditText) findViewById(R.id.nickname); mNicknameView.setText(Preferences.getUserID()); @@ -97,9 +122,45 @@ public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { mEmailView = (EditText) findViewById(R.id.email); - mServerView = (EditText) findViewById(R.id.server); - mServerView.setText(Preferences.getServer()); - if (mServerView.getText().toString().equals(Constants.DEFAULT_SERVER)) mPasswordView.setError(getString(R.string.error_password_summaryUGR)); + mServerView = (Spinner) findViewById(R.id.serverSpinner); + // Create an ArrayAdapter using the string array and a default spinner layout + serverAdapter = ArrayAdapter.createFromResource(this, + R.array.servers_array, android.R.layout.simple_spinner_item); + // Specify the layout to use when the list of choices appears + serverAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + // Apply the adapter to the spinner + mServerView.setAdapter(serverAdapter); + mServerView.setOnItemSelectedListener(this); + + if (serverAdapter.getItem(0).equals(Constants.SWAD_UGR_SERVER)) + mPasswordView.setError(getString(R.string.error_password_summaryUGR)); + + mServerTextView = (EditText) findViewById(R.id.serverEditText); + mServerTextView.setText(Preferences.getServer()); + mServerTextView.setOnFocusChangeListener(new View.OnFocusChangeListener() { + public void onFocusChange(View v, boolean hasFocus) { + String value = mServerTextView.getText().toString(); + + if (!hasFocus) { + if (value.isEmpty()) { + mServerTextView.setError(getString(R.string.noServer)); + } else { + mServerTextView.setError(null); + + if (value.startsWith("http://")) { + value = value.substring(7); + } else if (value.startsWith("https://")) { + value = value.substring(8); + } + + setSelectedServer(value); + Preferences.setServer(value); + + Log.i(TAG, "Server setted to " + Preferences.getServer()); + } + } + } + }); mLoginStatusMessageView = (TextView) findViewById(R.id.login_status_message); @@ -124,18 +185,22 @@ public void createAccount() { String emailValue; String passwordValue; String serverValue; - String toastMsg; // Reset errors. mNicknameView.setError(null); + mEmailView.setError(null); mPasswordView.setError(null); + mServerTextView.setError(null); // Store values at the time of the login attempt. nicknameValue = mNicknameView.getText().toString(); passwordValue = mPasswordView.getText().toString(); emailValue = mEmailView.getText().toString(); - serverValue = mServerView.getText().toString(); - toastMsg = getString(R.string.error_invalid_password); + serverValue = mServerView.getSelectedItem().toString(); + + if(serverValue.contains(getString(R.string.otherMsg))) { + serverValue = mServerTextView.getText().toString().replaceFirst("^(http://|https://)",""); + } boolean cancel = false; View focusView = null; @@ -174,8 +239,10 @@ public void createAccount() { } // Check for a valid server. - if (!TextUtils.isEmpty(serverValue)) { - Preferences.setServer(serverValue); + if (TextUtils.isEmpty(serverValue)) { + mServerTextView.setError(getString(R.string.error_field_required)); + focusView = mServerTextView; + cancel = true; } if (cancel) { @@ -237,26 +304,6 @@ public void onAnimationEnd(Animator animation) { } } - private void whyMyPasswordNotWorkDialog() { - SWADroidTracker.sendScreenView(getApplicationContext(), "SWADroid WhyMyPasswordNotWork"); - - AlertDialog passwordNotWorkDialog = - DialogFactory.createNeutralDialog(this, - R.layout.dialog_why_password, - R.string.why_password_dialog_title, - -1, - R.string.ok, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - } - }); - - passwordNotWorkDialog.show(); - } - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { String errorMsg = ""; @@ -314,5 +361,46 @@ public void onClick(DialogInterface dialog, int which) { } } } + + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + setServer(position); + } + + @Override + public void onNothingSelected(AdapterView parent) { + //Do nothing + } + + private void setServer(int position) { + String serverValue = serverAdapter.getItem(position).toString(); + + //Reset password error + mPasswordView.setError(null); + if (Constants.SWAD_UGR_SERVER.equals(serverValue)) + mPasswordView.setError(getString(R.string.error_password_summaryUGR)); + + if(serverValue.contains(getString(R.string.otherMsg))) { + mServerTextView.setText(Preferences.getServer()); + mServerTextView.setVisibility(View.VISIBLE); + } else { + mServerTextView.setVisibility(View.GONE); + Preferences.setServer(serverValue); + } + + Log.i(TAG, "Server setted to " + Preferences.getServer()); + } + + private void setSelectedServer(String server) { + int serverPosition; + + if(serversList.contains(server)) { + serverPosition = serverAdapter.getPosition(server); + } else { + serverPosition = serversList.size() - 1; + } + + mServerView.setSelection(serverPosition); + } } diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/package.html new file mode 100644 index 000000000..df51ef930 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/package.html @@ -0,0 +1,7 @@ + + + + +Account package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Courses.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/Courses.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/Courses.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/Courses.java index 7af645dd9..ca4dde386 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Courses.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/Courses.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.courses; import android.app.Activity; import android.content.Context; @@ -32,14 +32,17 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.Course; import es.ugr.swad.swadroid.model.Model; +import es.ugr.swad.swadroid.modules.Module; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Courses module for get user's courses + * @see getCourses * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/package.html new file mode 100644 index 000000000..bf00aeb12 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/courses/package.html @@ -0,0 +1,7 @@ + + + + +Courses package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryItem.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryItem.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryItem.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryItem.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java index 0643a9960..4986b0ece 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryNavigator.java @@ -34,7 +34,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; /** diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java similarity index 93% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java index 1fec76dc6..42b400520 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DirectoryTreeDownload.java @@ -26,14 +26,15 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.User; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * DirectoryTreeDownload gets directory tree of files of general documents of a course/group * or documents from shared area of a course/group + * @see getDirectoryTree * * @author Helena Rodriguez Gijon */ @@ -42,12 +43,6 @@ public class DirectoryTreeDownload extends Module { private int treeCode; //documents of course or common zone of course private int group = 0; // documents of the course - //TODO esta clase tiene q cambiar - @SuppressWarnings("unused") - private class DirectoryTree { - String tree; - } - @Override protected void requestService() throws Exception { createRequest(SOAPClient.CLIENT_TYPE); diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadFactory.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadFactory.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadManager.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadManager.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadManager.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadManager.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/Downloads.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/Downloads.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/Downloads.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/Downloads.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java index 97e49a424..2496b85d5 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java @@ -51,14 +51,14 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.MenuActivity; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.GroupType; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.GroupTypes; -import es.ugr.swad.swadroid.modules.Groups; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.groups.GroupTypes; +import es.ugr.swad.swadroid.modules.groups.Groups; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.marks.GetMarks; import es.ugr.swad.swadroid.modules.marks.Marks; import es.ugr.swad.swadroid.utils.Utils; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java index 2f3b915e5..5ff0023b1 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/FileDownloaderAsyncTask.java @@ -27,7 +27,7 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; /** * Download the file located at the given URL, save it to a file. diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java index b0b7d522d..38085a054 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/GetFile.java @@ -29,15 +29,15 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.model.Group; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Module to get information of a file located in SWAD - * It makes use of the web service getFile (see {@linktourl http://swad.ugr.es/ws/#getFile}) + * @see getFile * * @param fileCode It indicates the file which information is requested * @return link temporal URL to download the file diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/NodeAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/downloads/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/downloads/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/GroupTypes.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/GroupTypes.java similarity index 92% rename from app/src/main/java/es/ugr/swad/swadroid/modules/GroupTypes.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/GroupTypes.java index 5f0e0f314..2fde92bef 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/GroupTypes.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/GroupTypes.java @@ -1,4 +1,4 @@ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.groups; import android.app.Activity; import android.content.Intent; @@ -13,15 +13,19 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.GroupType; import es.ugr.swad.swadroid.model.Model; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.Module; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Group type module to get the group types of a given course * and stores them in the database + * @see getGroupTypes * * @author Helena Rodriguez Gijon */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Groups.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/Groups.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/Groups.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/Groups.java index 78e089124..1982040d6 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Groups.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/Groups.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.groups; import android.app.Activity; import android.content.Intent; @@ -31,15 +31,18 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.Model; +import es.ugr.swad.swadroid.modules.Module; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Groups module gets user's groups inside the current course * and stores them in the database. + * @see getGroups * It needs as extra data: * - (long) courseCode course code . It indicates the course to which the groups belong * diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java index 8c7196c46..c3a0f9739 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java @@ -36,16 +36,14 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.gui.MenuExpandableListActivity; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.Model; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.GroupTypes; -import es.ugr.swad.swadroid.modules.Groups; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; /** * Activity to manage the enrollments into groups. It is responsible for maintain the UI and send the appropriate web services diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java index 06221a5e3..332b9d9b9 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/SendMyGroups.java @@ -33,13 +33,13 @@ import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.Group; import es.ugr.swad.swadroid.model.Model; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Module to enroll into groups. - * It makes use of the web service sendGroups (see http://swad.ugr.es/ws/#sendMessage) + * It makes use of the web service sendMyGroups (see https://openswad.org/ws/#sendMyGroups) * It needs as extra data: * - (long) courseCode course code . It indicates the course to which the groups belong * - (string) myGroups: String that contains group codes separated with comma diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/groups/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/groups/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java similarity index 94% rename from app/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java index f3787e72d..98be8a26b 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/information/Information.java @@ -14,14 +14,18 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.WebViewFactory; import es.ugr.swad.swadroid.model.User; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; - +/** + * Module for get course info + * @see getCourseInfo + * + */ public class Information extends Module { public static final String TAG = Constants.APP_TAG + " Information"; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/information/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/information/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/information/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/information/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Login.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/Login.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/Login.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/Login.java index b9294c314..c794dec36 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Login.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/Login.java @@ -17,7 +17,7 @@ * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.login; import android.os.Bundle; import android.util.Log; @@ -26,14 +26,16 @@ import org.ksoap2.serialization.SoapObject; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.User; +import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Login module for connect to SWAD. + * @see loginByUserPasswordKey * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon diff --git a/app/src/main/java/es/ugr/swad/swadroid/LoginActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/LoginActivity.java similarity index 68% rename from app/src/main/java/es/ugr/swad/swadroid/LoginActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/LoginActivity.java index ac1881feb..022ac5925 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/LoginActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/LoginActivity.java @@ -13,33 +13,43 @@ * along with this program. If not, see . */ -package es.ugr.swad.swadroid; +package es.ugr.swad.swadroid.modules.login; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.annotation.TargetApi; import android.app.Activity; +import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.app.AlertDialog; import android.support.v7.app.AppCompatActivity; +import android.text.InputType; import android.text.TextUtils; +import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; import java.security.NoSuchAlgorithmException; +import java.util.Arrays; +import java.util.List; +import es.ugr.swad.swadroid.Constants; +import es.ugr.swad.swadroid.preferences.Preferences; +import es.ugr.swad.swadroid.R; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; -import es.ugr.swad.swadroid.modules.Login; -import es.ugr.swad.swadroid.modules.RecoverPassword; +import es.ugr.swad.swadroid.modules.password.RecoverPassword; import es.ugr.swad.swadroid.modules.account.CreateAccountActivity; import es.ugr.swad.swadroid.utils.Crypto; import es.ugr.swad.swadroid.utils.Utils; @@ -51,23 +61,23 @@ * @author Juan Miguel Boyero Corral * */ -public class LoginActivity extends AppCompatActivity { +public class LoginActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener { public static final String TAG = Constants.APP_TAG + " LoginActivity"; + private static List serversList; + private boolean mLoginError = false; // UI references for the login form. - private EditText mDniView; + private EditText mIDView; private EditText mPasswordView; - private EditText mServerView; + private EditText mServerTextView; + private Spinner mServerView; private View mLoginFormView; private View mLoginStatusView; - // private View mMainScreenView; private TextView mLoginStatusMessageView; - private Button mSignInButton; - private Button mLostPasswordButton; - private Button mCreateAccountButton; private boolean mFromPreference = false; + private ArrayAdapter serverAdapter; @Override protected void onCreate(Bundle savedInstanceState) { @@ -76,19 +86,30 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.login_activity); mFromPreference = getIntent().getBooleanExtra("fromPreference", false); + serversList = Arrays.asList(getResources().getStringArray(R.array.servers_array)); + setupLoginForm(); } + @Override + protected void onResume() { + super.onResume(); + + if(!mServerView.getSelectedItem().equals(Preferences.getServer())) { + setSelectedServer(Preferences.getServer()); + } + } + private void setupLoginForm() { mLoginFormView = findViewById(R.id.login_form); mLoginStatusView = findViewById(R.id.login_status); - mSignInButton = (Button) findViewById(R.id.sign_in_button); - mLostPasswordButton = (Button) findViewById(R.id.lost_password); - mCreateAccountButton = (Button) findViewById(R.id.create_account); + Button mSignInButton = (Button) findViewById(R.id.sign_in_button); + Button mLostPasswordButton = (Button) findViewById(R.id.lost_password); + Button mCreateAccountButton = (Button) findViewById(R.id.create_account); - mDniView = (EditText) findViewById(R.id.DNI); - mDniView.setText(Preferences.getUserID()); + mIDView = (EditText) findViewById(R.id.ID); + mIDView.setText(Preferences.getUserID()); mPasswordView = (EditText) findViewById(R.id.password); mPasswordView.setText(""); @@ -103,9 +124,45 @@ public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { } }); - mServerView = (EditText) findViewById(R.id.server); - mServerView.setText(Preferences.getServer()); - if (mServerView.getText().toString().equals(Constants.DEFAULT_SERVER)) mPasswordView.setError(getString(R.string.error_password_summaryUGR)); + mServerTextView = (EditText) findViewById(R.id.serverEditText); + mServerTextView.setText(Preferences.getServer()); + mServerTextView.setOnFocusChangeListener(new View.OnFocusChangeListener() { + public void onFocusChange(View v, boolean hasFocus) { + String value = mServerTextView.getText().toString(); + + if (!hasFocus) { + if(value.isEmpty()) { + mServerTextView.setError(getString(R.string.noServer)); + } else { + mServerTextView.setError(null); + + if(value.startsWith("http://")) { + value = value.substring(7); + } else if(value.startsWith("https://")) { + value = value.substring(8); + } + + setSelectedServer(value); + Preferences.setServer(value); + + Log.i(TAG, "Server setted to " + Preferences.getServer()); + } + } + } + }); + + mServerView = (Spinner) findViewById(R.id.serverSpinner); + // Create an ArrayAdapter using the string array and a default spinner layout + serverAdapter = ArrayAdapter.createFromResource(this, + R.array.servers_array, android.R.layout.simple_spinner_item); + // Specify the layout to use when the list of choices appears + serverAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + // Apply the adapter to the spinner + mServerView.setAdapter(serverAdapter); + mServerView.setOnItemSelectedListener(this); + + if (serverAdapter.getItem(0).equals(Constants.SWAD_UGR_SERVER)) + mPasswordView.setError(getString(R.string.error_password_summaryUGR)); mLoginStatusMessageView = (TextView) findViewById(R.id.login_status_message); @@ -137,27 +194,33 @@ public void onClick(View view) { public void attemptLogin() { SWADroidTracker.sendScreenView(getApplicationContext(), "SWADroid Login"); - // Values for DNI and password at the time of the login attempt. - String DniValue; + // Values for ID and password at the time of the login attempt. + String idValue; String passwordValue; String serverValue; String toastMsg; // Reset errors. - mDniView.setError(null); + mIDView.setError(null); mPasswordView.setError(null); + mServerTextView.setError(null); + + boolean cancel = false; + View focusView = null; // Store values at the time of the login attempt. - DniValue = mDniView.getText().toString(); + idValue = mIDView.getText().toString(); passwordValue = mPasswordView.getText().toString(); - serverValue = mServerView.getText().toString(); + serverValue = mServerView.getSelectedItem().toString(); + + if(serverValue.contains(getString(R.string.otherMsg))) { + serverValue = mServerTextView.getText().toString().replaceFirst("^(http://|https://)",""); + } + toastMsg = - mServerView.getText().toString().equals("swad.ugr.es") ? getString(R.string.error_password_summaryUGR) + serverValue.equals(Constants.SWAD_UGR_SERVER) ? getString(R.string.error_password_summaryUGR) : getString(R.string.error_invalid_password); - boolean cancel = false; - View focusView = null; - // Check for a valid password. if (TextUtils.isEmpty(passwordValue)) { mPasswordView.setError(getString(R.string.error_field_required)); @@ -181,10 +244,17 @@ public void attemptLogin() { Toast.LENGTH_LONG).show(); } - // Check for a valid DNI. - if (TextUtils.isEmpty(DniValue)) { - mDniView.setError(getString(R.string.error_field_required)); - focusView = mDniView; + // Check for a valid ID. + if (TextUtils.isEmpty(idValue)) { + mIDView.setError(getString(R.string.error_field_required)); + focusView = mIDView; + cancel = true; + } + + // Check for a valid server. + if (TextUtils.isEmpty(serverValue)) { + mServerTextView.setError(getString(R.string.error_field_required)); + focusView = mServerTextView; cancel = true; } @@ -197,13 +267,13 @@ public void attemptLogin() { // perform the user login attempt. mLoginStatusMessageView.setText(R.string.login_progress_signing_in); try { - Preferences.setUserID(DniValue); + Preferences.setUserID(idValue); Preferences.setUserPassword(Crypto.encryptPassword(passwordValue)); - Preferences.setServer(serverValue); } catch (NoSuchAlgorithmException e) { // TODO, solucionar //error(TAG, e.getMessage(), e, true); } + showProgress(true); startActivityForResult(new Intent(this, Login.class), Constants.LOGIN_REQUEST_CODE); } @@ -246,6 +316,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { case Constants.RECOVER_PASSWORD_REQUEST_CODE: Toast.makeText(this, R.string.lost_password_failure, Toast.LENGTH_LONG).show(); break; + case Constants.CREATE_ACCOUNT_REQUEST_CODE: + break; } } } @@ -320,6 +392,7 @@ private void recoverPasswordDialog() { user.setTextColor(Color.BLACK); user.setHintTextColor(Color.GRAY); user.setHint(getString(R.string.prompt_email)); + user.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); builder.setView(user) .setTitle(R.string.lost_password_dialog_title) @@ -355,5 +428,45 @@ protected void onDestroy() { } super.onDestroy(); } - + + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + setServer(position); + } + + @Override + public void onNothingSelected(AdapterView parent) { + //Do nothing + } + + private void setServer(int position) { + String serverValue = serverAdapter.getItem(position).toString(); + + //Reset password error + mPasswordView.setError(null); + if (Constants.SWAD_UGR_SERVER.equals(serverValue)) + mPasswordView.setError(getString(R.string.error_password_summaryUGR)); + + if(serverValue.contains(getString(R.string.otherMsg))) { + mServerTextView.setText(Preferences.getServer()); + mServerTextView.setVisibility(View.VISIBLE); + } else { + mServerTextView.setVisibility(View.GONE); + Preferences.setServer(serverValue); + } + + Log.i(TAG, "Server setted to " + Preferences.getServer()); + } + + private void setSelectedServer(String server) { + int serverPosition; + + if(serversList.contains(server)) { + serverPosition = serverAdapter.getPosition(server); + } else { + serverPosition = serversList.size() - 1; + } + + mServerView.setSelection(serverPosition); + } } diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/package.html new file mode 100644 index 000000000..653192d71 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/package.html @@ -0,0 +1,7 @@ + + + + +Login package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java similarity index 96% rename from app/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java index 1a5c087ed..bd376c190 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/GetMarks.java @@ -30,15 +30,16 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.model.User; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Marks module for get user's marks + * @see getMarks * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java similarity index 94% rename from app/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java index 25c5a9a10..fcd677a84 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/Marks.java @@ -12,10 +12,10 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.MenuActivity; import es.ugr.swad.swadroid.gui.WebViewFactory; -import es.ugr.swad.swadroid.modules.Courses; +import es.ugr.swad.swadroid.modules.courses.Courses; import es.ugr.swad.swadroid.utils.Utils; /** diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/marks/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/marks/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/marks/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/FilterUsersList.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java index 918ad24ca..884746c06 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java @@ -35,14 +35,15 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.model.User; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Module for send messages. + * @see sendMessage * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/messages/UsersList.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/UsersList.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/messages/UsersList.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/UsersList.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/messages/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/messages/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/Notices.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/Notices.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/Notices.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/Notices.java index a266c03ff..58f8166ed 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/Notices.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/Notices.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.notices; import android.app.AlertDialog; import android.app.Dialog; @@ -33,13 +33,17 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.model.User; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.Module; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Module for send messages. + * @see sendNotice * * @author Helena Rodriguez Gijon * @author Antonio Aguilera Malagon diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/package.html new file mode 100644 index 000000000..e3be7e5d2 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notices/package.html @@ -0,0 +1,7 @@ + + + + +Notices package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java index 509483431..e453449da 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationItem.java @@ -30,7 +30,7 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.ImageFactory; import es.ugr.swad.swadroid.gui.MenuActivity; import es.ugr.swad.swadroid.gui.WebViewFactory; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java index ca3673776..c01ca8f01 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java @@ -39,7 +39,6 @@ import android.widget.ExpandableListView; import android.widget.ExpandableListView.OnChildClickListener; import android.widget.LinearLayout; -import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; @@ -50,15 +49,14 @@ import java.util.Vector; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.AlertNotificationFactory; -import es.ugr.swad.swadroid.gui.SwipeListViewTouchListener; import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.model.SWADNotification; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.sync.SyncUtils; import es.ugr.swad.swadroid.utils.DateTimeUtils; @@ -67,6 +65,7 @@ /** * Notifications module for get user's notifications + * @see getNotifications * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon @@ -442,21 +441,25 @@ protected void requestService() throws Exception { .toString()); String content = pii.getProperty("content").toString(); boolean notifReadSWAD = (status >= 4); + boolean notifCancelled = (status >= 8); + + // Add not cancelled notifications only + if(!notifCancelled) { + SWADNotification n = new SWADNotification(notifCode, + eventCode, eventType, eventTime, userSurname1, + userSurname2, userFirstName, userPhoto, location, + summary, status, content, notifReadSWAD, + notifReadSWAD); + dbHelper.insertNotification(n); + + // Count unread notifications only + if (!notifReadSWAD) { + notifCount++; + } - SWADNotification n = new SWADNotification(notifCode, - eventCode, eventType, eventTime, userSurname1, - userSurname2, userFirstName, userPhoto, location, - summary, status, content, notifReadSWAD, - notifReadSWAD); - dbHelper.insertNotification(n); - - // Count unread notifications only - if (!notifReadSWAD) { - notifCount++; + if (isDebuggable) + Log.d(TAG, n.toString()); } - - if (isDebuggable) - Log.d(TAG, n.toString()); } // Request finalized without errors @@ -493,10 +496,17 @@ protected void connect() { @Override protected void postConnect() { Notification notif; - PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), - 0, - new Intent(this, Notifications.class), - Intent.FLAG_ACTIVITY_NEW_TASK); + Intent notificationIntent = new Intent(this, Notifications.class); + PendingIntent pendingIntent; + + notificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //single top to avoid creating many activity stacks queue + notificationIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + + pendingIntent = PendingIntent.getActivity(getApplicationContext(), + 0, + notificationIntent, + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT); if (!SyncUtils.isSyncAutomatically(getApplicationContext())) { if (notifCount > 0) { @@ -611,21 +621,6 @@ public boolean onOptionsItemSelected(MenuItem item) { } } - private void swipeItem(int position) { - int notSeenChildrenCount = adapter.getChildrenCount(NOT_SEEN_GROUP_ID); - long childId; - - if(position <= notSeenChildrenCount) { - childId = adapter.getChildId(NOT_SEEN_GROUP_ID, position - 1); - - //Set notification as seen locally - dbHelper.updateNotification(childId, "seenLocal", Utils.parseBoolString(true)); - sendReadedNotifications(); - - refreshScreen(); - } - } - /* * @Override public void setContentView(int layoutResID) { View v = * getLayoutInflater().inflate(layoutResID, refreshLayout, false); diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java index fa67cb16c..070e1a768 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java @@ -151,12 +151,12 @@ public View getChildView(int groupPosition, final int childPosition, } else if (type.equals("sharedFile")) { type = activity.getString(R.string.sharedFile); notificationIcon.setImageResource(R.drawable.file); - } else if (type.equals("enrollment")) { - type = activity.getString(R.string.enrollment); - notificationIcon.setImageResource(R.drawable.enrollment); } else if (type.equals("enrollmentRequest")) { type = activity.getString(R.string.enrollmentRequest); notificationIcon.setImageResource(R.drawable.enrollment_request); + } else if (type.startsWith("enrollment")) { + type = activity.getString(R.string.enrollment); + notificationIcon.setImageResource(R.drawable.enrollment); } else if (type.equals("documentFile")) { type = activity.getString(R.string.survey); notificationIcon.setImageResource(R.drawable.survey); diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java index 2a7bb9e80..e6d98de33 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsMarkAllAsRead.java @@ -25,14 +25,15 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Notifications module for mark as read user's notifications + * @see markNotificationsAsRead * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java similarity index 93% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java index 4e706e852..5ea14c4ff 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java @@ -51,15 +51,15 @@ import javax.net.ssl.SSLException; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.AlertNotificationFactory; import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.model.SWADNotification; import es.ugr.swad.swadroid.model.User; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.ssl.SecureConnection; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.IWebserviceClient; @@ -67,6 +67,7 @@ /** * Service for notifications sync adapter. + * @see getNotifications * * @author Juan Miguel Boyero Corral */ @@ -365,16 +366,20 @@ private static void getNotifications() throws Exception { Integer status = Integer.valueOf(pii.getProperty("status").toString()); String content = pii.getProperty("content").toString(); boolean notifReadSWAD = (status >= 4); - - SWADNotification n = new SWADNotification(notifCode, eventCode, eventType, eventTime, userSurname1, userSurname2, userFirstName, userPhoto, location, summary, status, content, notifReadSWAD, notifReadSWAD); - dbHelper.insertNotification(n); - - //Count unread notifications only - if(!notifReadSWAD) { - notifCount++; - } + boolean notifCancelled = (status >= 8); - //Log.d(TAG, n.toString()); + // Add not cancelled notifications only + if(!notifCancelled) { + SWADNotification n = new SWADNotification(notifCode, eventCode, eventType, eventTime, userSurname1, userSurname2, userFirstName, userPhoto, location, summary, status, content, notifReadSWAD, notifReadSWAD); + dbHelper.insertNotification(n); + + //Count unread notifications only + if (!notifReadSWAD) { + notifCount++; + } + + //Log.d(TAG, n.toString()); + } } //Request finalized without errors @@ -424,10 +429,17 @@ private static void performSync(Context context, Account account, Bundle extras, throws Exception { Notification notif; - PendingIntent pendingIntent = PendingIntent.getActivity(context, - 0, - new Intent(context, Notifications.class), - Intent.FLAG_ACTIVITY_NEW_TASK); + Intent notificationIntent = new Intent(context, Notifications.class); + PendingIntent pendingIntent; + + notificationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //single top to avoid creating many activity stacks queue + notificationIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + + pendingIntent = PendingIntent.getActivity(context, + 0, + notificationIntent, + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT); //Notify synchronization start Intent startIntent = new Intent(); diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/notifications/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/notifications/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/PasswordDialogPreference.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/PasswordDialogPreference.java similarity index 93% rename from app/src/main/java/es/ugr/swad/swadroid/PasswordDialogPreference.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/PasswordDialogPreference.java index 0599d4e6f..fd1254d1a 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/PasswordDialogPreference.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/PasswordDialogPreference.java @@ -1,5 +1,5 @@ -package es.ugr.swad.swadroid; +package es.ugr.swad.swadroid.modules.password; import android.content.Context; import android.content.DialogInterface; @@ -8,6 +8,8 @@ import android.view.View; import android.widget.EditText; +import es.ugr.swad.swadroid.R; + public class PasswordDialogPreference extends DialogPreference { private EditText mEditTextPassword; diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/RecoverPassword.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/RecoverPassword.java similarity index 94% rename from app/src/main/java/es/ugr/swad/swadroid/modules/RecoverPassword.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/RecoverPassword.java index d2734eeff..8e9054e0c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/RecoverPassword.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/RecoverPassword.java @@ -17,7 +17,7 @@ * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.password; import android.os.Bundle; @@ -26,11 +26,13 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.model.User; +import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Recover password module in case user does not remember it + * @see getNewPassword * * @author Alejandro Alcalde */ diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/package.html new file mode 100644 index 000000000..eca573126 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/password/package.html @@ -0,0 +1,7 @@ + + + + +Password package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/GenerateQR.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/GenerateQR.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/modules/GenerateQR.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/GenerateQR.java index 16d376886..b858cf057 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/GenerateQR.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/GenerateQR.java @@ -1,4 +1,4 @@ -package es.ugr.swad.swadroid.modules; +package es.ugr.swad.swadroid.modules.qr; import android.app.Activity; import android.content.Intent; @@ -12,8 +12,9 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.MenuActivity; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.utils.QR; public class GenerateQR extends MenuActivity { diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/package.html new file mode 100644 index 000000000..99340b7f9 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/qr/package.html @@ -0,0 +1,7 @@ + + + + +QR package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java index 943e8ec92..145389b7c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsDownload.java @@ -33,14 +33,15 @@ import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.Event; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Rollcall events download module. + * @see getAttendanceEvents * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java index c432e434b..eb0c39705 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java @@ -39,10 +39,10 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.gui.MenuExpandableListActivity; -import es.ugr.swad.swadroid.modules.Courses; +import es.ugr.swad.swadroid.modules.courses.Courses; /** * Rollcall module. diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java index 6e591a8eb..d18aaa052 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java @@ -45,12 +45,12 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.gui.MenuExpandableListActivity; import es.ugr.swad.swadroid.model.UserAttendance; -import es.ugr.swad.swadroid.modules.Courses; +import es.ugr.swad.swadroid.modules.courses.Courses; /** * UsersActivity module. diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersCursorAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java index 7fbabe702..636446a1f 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersDownload.java @@ -35,12 +35,13 @@ import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.User; import es.ugr.swad.swadroid.model.UserAttendance; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Rollcall users download module. + * @see getAttendanceUsers * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java index 2e0c99ae7..2aaa58e92 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersSend.java @@ -30,13 +30,14 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.database.DataBaseHelper; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Rollcall users send module. + * @see sendAttendanceUsers * * @author Juan Miguel Boyero Corral */ diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/rollcall/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/AnswerTypesArrayAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/AnswerTypesArrayAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/AnswerTypesArrayAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/AnswerTypesArrayAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TagsArrayAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TagsArrayAdapter.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/TagsArrayAdapter.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TagsArrayAdapter.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java index c854305c0..ab4086bc8 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/Tests.java @@ -31,11 +31,11 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.ImageListAdapter; import es.ugr.swad.swadroid.gui.ImageListItem; import es.ugr.swad.swadroid.gui.MenuActivity; -import es.ugr.swad.swadroid.modules.Courses; +import es.ugr.swad.swadroid.modules.courses.Courses; /** * Tests module for download questions and evaluate user skills in a course diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java similarity index 97% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java index c557d0352..73b7d2527 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java @@ -29,14 +29,15 @@ import es.ugr.swad.swadroid.R; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.model.Test; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.Utils; import es.ugr.swad.swadroid.webservices.SOAPClient; /** * Tests module for download and update questions + * @see getTestConfig * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java similarity index 99% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java index 38f0b860e..b2c89c128 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java @@ -50,7 +50,7 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; import es.ugr.swad.swadroid.gui.MenuActivity; import es.ugr.swad.swadroid.gui.WebViewFactory; @@ -60,7 +60,7 @@ import es.ugr.swad.swadroid.model.TestAnswer; import es.ugr.swad.swadroid.model.TestQuestion; import es.ugr.swad.swadroid.model.TestTag; -import es.ugr.swad.swadroid.modules.Courses; +import es.ugr.swad.swadroid.modules.courses.Courses; import es.ugr.swad.swadroid.utils.Utils; /** diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java index 50e3244d6..7b865152c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java @@ -31,14 +31,12 @@ import es.ugr.swad.swadroid.Constants; import es.ugr.swad.swadroid.R; -import es.ugr.swad.swadroid.database.DataBaseHelper; -import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.model.Test; import es.ugr.swad.swadroid.model.TestAnswer; import es.ugr.swad.swadroid.model.TestQuestion; import es.ugr.swad.swadroid.model.TestTag; -import es.ugr.swad.swadroid.modules.Courses; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.courses.Courses; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.utils.DateTimeUtils; import es.ugr.swad.swadroid.utils.Utils; @@ -46,6 +44,7 @@ /** * Tests module for download and update questions + * @see getTests * * @author Juan Miguel Boyero Corral * @author Antonio Aguilera Malagon diff --git a/app/src/main/java/es/ugr/swad/swadroid/modules/tests/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/modules/tests/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/Preferences.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java similarity index 93% rename from app/src/main/java/es/ugr/swad/swadroid/Preferences.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java index e9e771745..09b0d3207 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/Preferences.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/Preferences.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with SWADroid. If not, see . */ -package es.ugr.swad.swadroid; +package es.ugr.swad.swadroid.preferences; import android.annotation.TargetApi; import android.content.Context; @@ -28,8 +28,10 @@ import java.security.NoSuchAlgorithmException; +import es.ugr.swad.swadroid.Constants; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.database.DataBaseHelper; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; import es.ugr.swad.swadroid.sync.SyncUtils; import es.ugr.swad.swadroid.utils.Crypto; @@ -159,29 +161,38 @@ public class Preferences { * Application context */ private static Context mContext; - + /** - * Constructor + * Gets application preferences + * @param ctx Application context + * @return Application preferences */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public Preferences(Context ctx) { - mContext = ctx; - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + private static void getPreferences(Context ctx) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { /* * If Android API >= 11 (HONEYCOMB) enable access to SharedPreferences from all processes - * of the application + * of the application */ - prefs = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_MULTI_PROCESS); - Log.i(TAG, "Android API >= 11 (HONEYCOMB). Enabling MODE_MULTI_PROCESS explicitly"); - } else { - /* + prefs = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_MULTI_PROCESS); + Log.i(TAG, "Android API >= 11 (HONEYCOMB). Enabling MODE_MULTI_PROCESS explicitly"); + } else { + /* * If Android API < 11 (HONEYCOMB) access is enabled by default * MODE_MULTI_PROCESS is not defined */ - prefs = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); - Log.i(TAG, "Android API < 11 (HONEYCOMB). MODE_MULTI_PROCESS is not defined and enabled by default"); - } + prefs = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); + Log.i(TAG, "Android API < 11 (HONEYCOMB). MODE_MULTI_PROCESS is not defined and enabled by default"); + } + } + + /** + * Constructor + */ + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + public Preferences(Context ctx) { + mContext = ctx; + + getPreferences(ctx); editor = prefs.edit(); @@ -236,11 +247,11 @@ public static void setUserPassword(String userPassword) { */ public static String getServer() { String server = prefs.getString(SERVERPREF, Constants.DEFAULT_SERVER); - + if(server.equals("")) { server = Constants.DEFAULT_SERVER; } - + return server; } diff --git a/app/src/main/java/es/ugr/swad/swadroid/PreferencesActivity.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java similarity index 95% rename from app/src/main/java/es/ugr/swad/swadroid/PreferencesActivity.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java index 985ff008a..eba09e76c 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/PreferencesActivity.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/PreferencesActivity.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package es.ugr.swad.swadroid; +package es.ugr.swad.swadroid.preferences; import android.app.AlertDialog; import android.content.Context; @@ -41,9 +41,13 @@ import java.util.Date; import java.util.List; +import es.ugr.swad.swadroid.Constants; +import es.ugr.swad.swadroid.R; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; import es.ugr.swad.swadroid.gui.DialogFactory; import es.ugr.swad.swadroid.gui.widget.SeekBarDialogPreference; -import es.ugr.swad.swadroid.modules.Login; +import es.ugr.swad.swadroid.modules.login.Login; +import es.ugr.swad.swadroid.modules.login.LoginActivity; import es.ugr.swad.swadroid.sync.SyncUtils; import es.ugr.swad.swadroid.utils.Crypto; import es.ugr.swad.swadroid.utils.Utils; @@ -94,10 +98,6 @@ public class PreferencesActivity extends PreferenceActivity implements OnPrefere * Share preference */ private static Preference sharePref; - /** - * Server preference - */ - //private static Preference serverPref; /** * Synchronization time preference */ @@ -194,7 +194,6 @@ protected void onCreate(Bundle savedInstanceState) { googlePlusPref = findPreference(Preferences.GOOGLEPLUSPREF); blogPref = findPreference(Preferences.BLOGPREF); sharePref = findPreference(Preferences.SHAREPREF); - //serverPref = findPreference(Preferences.SERVERPREF); syncTimePref = findPreference(Preferences.SYNCTIMEPREF); syncEnablePref = (CheckBoxPreference) findPreference(Preferences.SYNCENABLEPREF); notifLimitPref = (SeekBarDialogPreference) findPreference(Preferences.NOTIFLIMITPREF); @@ -309,8 +308,6 @@ public boolean onPreferenceClick(Preference preference) { return true; } }); - - //mServer = Preferences.getServer(); try { currentVersionPref.setSummary(getPackageManager().getPackageInfo(getPackageName(), 0).versionName); @@ -363,13 +360,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { } catch (NoSuchAlgorithmException ex) { error(TAG, ex.getMessage(), ex, true); } - /*} else if (Preferences.SERVERPREF.equals(key)) { - mServer = newValue.toString(); - Preferences.setServer(mServer); - serverPref.setSummary(mServer); - //If preferences have changed, logout - Preferences.logoutClean(ctx, key); - syncPrefsChanged = true;*/ } else if(Preferences.SYNCENABLEPREF.equals(key)) { boolean syncEnabled = (Boolean) newValue; Preferences.setSyncEnabled(syncEnabled); @@ -480,13 +470,6 @@ protected void onResume() { List prefSyncTimeEntries = Arrays.asList(getResources().getStringArray(R.array.prefSyncTimeEntries)); int prefSyncTimeIndex = prefSyncTimeValues.indexOf(Preferences.getSyncTime()); String prefSyncTimeEntry = prefSyncTimeEntries.get(prefSyncTimeIndex); - /*mServer = Preferences.getServer(); - - if (!mServer.equals("")) { - serverPref.setSummary(mServer); - } else { - serverPref.setSummary(Constants.DEFAULT_SERVER); - }*/ if(lastSyncTime == 0) { syncEnablePref.setSummary(getString(R.string.lastSyncTimeLabel) + ": " @@ -498,5 +481,6 @@ protected void onResume() { } syncTimePref.setSummary(prefSyncTimeEntry); + logOutPref.setSummary(getString(R.string.logout_preferences) + " " + Preferences.getServer()); } } diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/package.html new file mode 100644 index 000000000..8c985e9c3 --- /dev/null +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/preferences/package.html @@ -0,0 +1,7 @@ + + + + +Preferences package. + + diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/EasySSLSocketFactory.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/EasySSLSocketFactory.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/EasySSLSocketFactory.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/EasySSLSocketFactory.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/EasyX509TrustManager.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/EasyX509TrustManager.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/EasyX509TrustManager.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/EasyX509TrustManager.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/SecureConnection.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/SecureConnection.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/SecureConnection.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/SecureConnection.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedHostnameVerifier.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedHostnameVerifier.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedHostnameVerifier.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedHostnameVerifier.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedTrustManager.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedTrustManager.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedTrustManager.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/UntrustedTrustManager.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/ssl/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/ssl/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/ssl/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticator.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticator.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticator.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticator.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticatorService.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticatorService.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticatorService.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/AccountAuthenticatorService.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/DummyProvider.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/DummyProvider.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/DummyProvider.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/DummyProvider.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/PeriodicSyncReceiver.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/PeriodicSyncReceiver.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/PeriodicSyncReceiver.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/PeriodicSyncReceiver.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/SyncUtils.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/SyncUtils.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/SyncUtils.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/SyncUtils.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/sync/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/sync/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/sync/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/sync/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/Base64.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Base64.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/utils/Base64.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Base64.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java index 6c58f0cde..3db9296e3 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Crypto.java @@ -34,7 +34,7 @@ import javax.crypto.spec.PBEParameterSpec; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; /** * Cryptographic class for encryption purposes. diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/DateTimeUtils.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/DateTimeUtils.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/utils/DateTimeUtils.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/DateTimeUtils.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java similarity index 98% rename from app/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java index ca5b3741a..5a4103a4b 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/OldCrypto.java @@ -30,7 +30,7 @@ import javax.crypto.spec.SecretKeySpec; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.SWADroidTracker; +import es.ugr.swad.swadroid.analytics.SWADroidTracker; /** * Cryptographic class for encryption purposes. diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/QR.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/QR.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/utils/QR.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/QR.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/Utils.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Utils.java similarity index 82% rename from app/src/main/java/es/ugr/swad/swadroid/utils/Utils.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Utils.java index 75c276ef9..cd8ff9500 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/utils/Utils.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/Utils.java @@ -72,18 +72,6 @@ public static boolean connectionAvailable(Context ctx) { //boolean connAvailable = false; ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE); - //Survey all networks (wifi, gprs...) - /*NetworkInfo[] networks = cm.getAllNetworkInfo(); - - for (NetworkInfo network : networks) { - //If any of them has a connection available, put boolean to true - if (network.isConnected()) { - connAvailable = true; - } - } - - return connAvailable;*/ - //If boolean remains false there is no connection available NetworkInfo activeNetwork = cm.getActiveNetworkInfo(); boolean isConnected = activeNetwork != null && @@ -162,19 +150,6 @@ public static boolean isValidDni(String dni) { Matcher matcher = pattern.matcher(dni); return matcher.matches(); - /*if (matcher.matches()) - return checkDniLetter(dni); - return false;*/ - } - - public static boolean checkDniLetter(String n) { - String number = n.substring(0, n.length() - 1); - String letter = n.substring(n.length() - 1, n.length()); - - int code = (Integer.valueOf(number)) % 23; - String[] abc = {"T", "R", "W", "A", "G", "M", "Y", "F", "P", "D", "X", "B", "N", "J", "Z", "S", "Q", "V", "H", "L", "C", "K", "E", "T"}; - - return abc[code].compareToIgnoreCase(letter) == 0; } public static boolean isValidNickname(String nickname) { @@ -210,22 +185,6 @@ public static String getSeenNotificationCodes(List markedNotificationsLis return seenNotifCodes; } - - /** - * Generates the stars sequence to be showed on password field - * - * @param size Length of the stars sequence - * @return Stars as a string concatenation of the specified length - */ - public static String getStarsSequence(int size) { - String stars = ""; - - for (int i = 0; i < size; i++) { - stars += "*"; - } - - return stars; - } public static String unAccent(String s) { String temp = Normalizer.normalize(s, Normalizer.Form.NFD); diff --git a/app/src/main/java/es/ugr/swad/swadroid/utils/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/utils/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/utils/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/utils/package.html diff --git a/app/src/main/java/es/ugr/swad/swadroid/webservices/IWebserviceClient.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/IWebserviceClient.java similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/webservices/IWebserviceClient.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/IWebserviceClient.java diff --git a/app/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java similarity index 76% rename from app/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java rename to SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java index 81b40e4f1..eb2f67156 100644 --- a/app/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/SOAPClient.java @@ -28,7 +28,7 @@ import org.ksoap2.transport.KeepAliveHttpsTransportSE; import es.ugr.swad.swadroid.Constants; -import es.ugr.swad.swadroid.Preferences; +import es.ugr.swad.swadroid.preferences.Preferences; /** * SOAP client for SWAD webservices @@ -45,10 +45,6 @@ public class SOAPClient implements IWebserviceClient { * Client type for webservices */ public static final String CLIENT_TYPE = "SOAP"; - /** - * SERVER param for webservice request. - */ - private String SERVER; /** * SOAP_ACTION param for webservice request. */ @@ -61,11 +57,7 @@ public class SOAPClient implements IWebserviceClient { * NAMESPACE param for webservice request. */ private String NAMESPACE; - /** - * SOAP connection - */ - private KeepAliveHttpsTransportSE connection; - /** + /** * Webservice request. */ private SoapObject request; @@ -82,16 +74,13 @@ public class SOAPClient implements IWebserviceClient { * Default constructor */ public SOAPClient() { - SERVER = Preferences.getServer(); // = "swad.ugr.es"; NAMESPACE = "urn:swad"; isDebuggable = (ApplicationInfo.FLAG_DEBUGGABLE != 0); } /** * Field constructor - * - * @param SERVER - * SERVER param for webservice request + * * @param SOAP_ACTION * SOAP_ACTION param for webservice request * @param METHOD_NAME @@ -99,24 +88,14 @@ public SOAPClient() { * @param NAMESPACE * NAMESPACE param for webservice request */ - public SOAPClient(String SERVER, String SOAP_ACTION, String METHOD_NAME, + public SOAPClient(String SOAP_ACTION, String METHOD_NAME, String NAMESPACE) { - this.SERVER = SERVER; this.SOAP_ACTION = SOAP_ACTION; this.METHOD_NAME = METHOD_NAME; this.NAMESPACE = NAMESPACE; isDebuggable = (ApplicationInfo.FLAG_DEBUGGABLE != 0); } - /** - * Gets METHOD_NAME parameter. - * - * @return METHOD_NAME parameter. - */ - public String getMETHOD_NAME() { - return METHOD_NAME; - } - /** * Sets METHOD_NAME parameter. * @@ -128,63 +107,6 @@ public void setMETHOD_NAME(String METHOD_NAME) { this.METHOD_NAME = METHOD_NAME; } - /** - * Gets NAMESPACE parameter. - * - * @return NAMESPACE parameter. - */ - public String getNAMESPACE() { - return NAMESPACE; - } - - /** - * Sets NAMESPACE parameter. - * - * @param NAMESPACE - * NAMESPACE parameter. - */ - public void setNAMESPACE(String NAMESPACE) { - this.NAMESPACE = NAMESPACE; - } - - /** - * Gets SOAP_ACTION parameter. - * - * @return SOAP_ACTION parameter. - */ - public String getSOAP_ACTION() { - return SOAP_ACTION; - } - - /** - * Sets SOAP_ACTION parameter. - * - * @param SOAP_ACTION - * SOAP_ACTION parameter. - */ - public void setSOAP_ACTION(String SOAP_ACTION) { - this.SOAP_ACTION = SOAP_ACTION; - } - - /** - * Gets the SERVER parameter - * - * @return The SERVER parameter - */ - public String getSERVER() { - return SERVER; - } - - /** - * Sets the SERVER parameter - * - * @param SERVER - * the SERVER parameter - */ - public void setSERVER(String SERVER) { - this.SERVER = SERVER; - } - /** * Gets the result returned by the webservice * @@ -230,7 +152,9 @@ public void addParam(String param, Object value) { public void sendRequest(Class cl, boolean simple) throws Exception { - Log.i(TAG, "Sending SOAP request to " + SERVER + " and method " + String server = Preferences.getServer(); + + Log.i(TAG, "Sending SOAP request to " + server + " and method " + METHOD_NAME); // Variables for URL splitting @@ -240,7 +164,7 @@ public void sendRequest(Class cl, boolean simple) String URL; // Split URL - URLArray = SERVER.split(delimiter, 2); + URLArray = server.split(delimiter, 2); URL = URLArray[0]; if (URLArray.length == 2) { PATH = delimiter + URLArray[1]; @@ -253,9 +177,11 @@ public void sendRequest(Class cl, boolean simple) * Android ssl libraries having trouble with certificates and * certificate authorities somehow messing up connecting/needing * reconnects. - */ - connection = new KeepAliveHttpsTransportSE(URL, 443, PATH, - Constants.CONNECTION_TIMEOUT); + * + * SOAP connection + */ + KeepAliveHttpsTransportSE connection = new KeepAliveHttpsTransportSE(URL, 443, PATH, + Constants.CONNECTION_TIMEOUT); SoapSerializationEnvelope envelope = new SoapSerializationEnvelope( SoapEnvelope.VER11); System.setProperty("http.keepAlive", "false"); diff --git a/app/src/main/java/es/ugr/swad/swadroid/webservices/package.html b/SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/package.html similarity index 100% rename from app/src/main/java/es/ugr/swad/swadroid/webservices/package.html rename to SWADroid/src/main/java/es/ugr/swad/swadroid/webservices/package.html diff --git a/app/src/main/res/drawable-hdpi/announce.png b/SWADroid/src/main/res/drawable-hdpi/announce.png similarity index 100% rename from app/src/main/res/drawable-hdpi/announce.png rename to SWADroid/src/main/res/drawable-hdpi/announce.png diff --git a/app/src/main/res/drawable-hdpi/ass.png b/SWADroid/src/main/res/drawable-hdpi/ass.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ass.png rename to SWADroid/src/main/res/drawable-hdpi/ass.png diff --git a/app/src/main/res/drawable-hdpi/back.png b/SWADroid/src/main/res/drawable-hdpi/back.png similarity index 100% rename from app/src/main/res/drawable-hdpi/back.png rename to SWADroid/src/main/res/drawable-hdpi/back.png diff --git a/app/src/main/res/drawable-hdpi/book.png b/SWADroid/src/main/res/drawable-hdpi/book.png similarity index 100% rename from app/src/main/res/drawable-hdpi/book.png rename to SWADroid/src/main/res/drawable-hdpi/book.png diff --git a/app/src/main/res/drawable-hdpi/btn_check_buttonless_on.png b/SWADroid/src/main/res/drawable-hdpi/btn_check_buttonless_on.png similarity index 100% rename from app/src/main/res/drawable-hdpi/btn_check_buttonless_on.png rename to SWADroid/src/main/res/drawable-hdpi/btn_check_buttonless_on.png diff --git a/app/src/main/res/drawable-hdpi/crs.png b/SWADroid/src/main/res/drawable-hdpi/crs.png similarity index 100% rename from app/src/main/res/drawable-hdpi/crs.png rename to SWADroid/src/main/res/drawable-hdpi/crs.png diff --git a/app/src/main/res/drawable-hdpi/desk.png b/SWADroid/src/main/res/drawable-hdpi/desk.png similarity index 100% rename from app/src/main/res/drawable-hdpi/desk.png rename to SWADroid/src/main/res/drawable-hdpi/desk.png diff --git a/app/src/main/res/drawable-hdpi/enrollment.png b/SWADroid/src/main/res/drawable-hdpi/enrollment.png similarity index 100% rename from app/src/main/res/drawable-hdpi/enrollment.png rename to SWADroid/src/main/res/drawable-hdpi/enrollment.png diff --git a/app/src/main/res/drawable-hdpi/enrollment_request.png b/SWADroid/src/main/res/drawable-hdpi/enrollment_request.png similarity index 100% rename from app/src/main/res/drawable-hdpi/enrollment_request.png rename to SWADroid/src/main/res/drawable-hdpi/enrollment_request.png diff --git a/app/src/main/res/drawable-hdpi/fabirthdaycake.png b/SWADroid/src/main/res/drawable-hdpi/fabirthdaycake.png similarity index 100% rename from app/src/main/res/drawable-hdpi/fabirthdaycake.png rename to SWADroid/src/main/res/drawable-hdpi/fabirthdaycake.png diff --git a/app/src/main/res/drawable-hdpi/faq.png b/SWADroid/src/main/res/drawable-hdpi/faq.png similarity index 100% rename from app/src/main/res/drawable-hdpi/faq.png rename to SWADroid/src/main/res/drawable-hdpi/faq.png diff --git a/app/src/main/res/drawable-hdpi/file.png b/SWADroid/src/main/res/drawable-hdpi/file.png similarity index 100% rename from app/src/main/res/drawable-hdpi/file.png rename to SWADroid/src/main/res/drawable-hdpi/file.png diff --git a/app/src/main/res/drawable-hdpi/folder.png b/SWADroid/src/main/res/drawable-hdpi/folder.png similarity index 100% rename from app/src/main/res/drawable-hdpi/folder.png rename to SWADroid/src/main/res/drawable-hdpi/folder.png diff --git a/app/src/main/res/drawable-hdpi/folder_open.png b/SWADroid/src/main/res/drawable-hdpi/folder_open.png similarity index 100% rename from app/src/main/res/drawable-hdpi/folder_open.png rename to SWADroid/src/main/res/drawable-hdpi/folder_open.png diff --git a/app/src/main/res/drawable-hdpi/folder_users.png b/SWADroid/src/main/res/drawable-hdpi/folder_users.png similarity index 100% rename from app/src/main/res/drawable-hdpi/folder_users.png rename to SWADroid/src/main/res/drawable-hdpi/folder_users.png diff --git a/app/src/main/res/drawable-hdpi/follow.png b/SWADroid/src/main/res/drawable-hdpi/follow.png similarity index 100% rename from app/src/main/res/drawable-hdpi/follow.png rename to SWADroid/src/main/res/drawable-hdpi/follow.png diff --git a/app/src/main/res/drawable-hdpi/forum.png b/SWADroid/src/main/res/drawable-hdpi/forum.png similarity index 100% rename from app/src/main/res/drawable-hdpi/forum.png rename to SWADroid/src/main/res/drawable-hdpi/forum.png diff --git a/app/src/main/res/drawable-hdpi/forward.png b/SWADroid/src/main/res/drawable-hdpi/forward.png similarity index 100% rename from app/src/main/res/drawable-hdpi/forward.png rename to SWADroid/src/main/res/drawable-hdpi/forward.png diff --git a/app/src/main/res/drawable-hdpi/grades.png b/SWADroid/src/main/res/drawable-hdpi/grades.png similarity index 100% rename from app/src/main/res/drawable-hdpi/grades.png rename to SWADroid/src/main/res/drawable-hdpi/grades.png diff --git a/app/src/main/res/drawable-hdpi/home.png b/SWADroid/src/main/res/drawable-hdpi/home.png similarity index 100% rename from app/src/main/res/drawable-hdpi/home.png rename to SWADroid/src/main/res/drawable-hdpi/home.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_accept.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_accept.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_accept.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_accept.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_person.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_add_person.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_add_person.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_add_person.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_read.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_read.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_read.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_read.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_refresh.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_refresh.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_refresh.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_reply.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_reply.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_reply.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_reply.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_save.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_save.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_save.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_save.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_search.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_send_now.png b/SWADroid/src/main/res/drawable-hdpi/ic_action_send_now.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_action_send_now.png rename to SWADroid/src/main/res/drawable-hdpi/ic_action_send_now.png diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_black.png b/SWADroid/src/main/res/drawable-hdpi/ic_arrow_back_black.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_arrow_back_black.png rename to SWADroid/src/main/res/drawable-hdpi/ic_arrow_back_black.png diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_black.png b/SWADroid/src/main/res/drawable-hdpi/ic_arrow_forward_black.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_arrow_forward_black.png rename to SWADroid/src/main/res/drawable-hdpi/ic_arrow_forward_black.png diff --git a/app/src/main/res/drawable-hdpi/ic_dialog_alert.png b/SWADroid/src/main/res/drawable-hdpi/ic_dialog_alert.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_dialog_alert.png rename to SWADroid/src/main/res/drawable-hdpi/ic_dialog_alert.png diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_swadroid.png b/SWADroid/src/main/res/drawable-hdpi/ic_launcher_swadroid.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_launcher_swadroid.png rename to SWADroid/src/main/res/drawable-hdpi/ic_launcher_swadroid.png diff --git a/app/src/main/res/drawable-hdpi/ic_menu_star.png b/SWADroid/src/main/res/drawable-hdpi/ic_menu_star.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_menu_star.png rename to SWADroid/src/main/res/drawable-hdpi/ic_menu_star.png diff --git a/app/src/main/res/drawable-hdpi/info.png b/SWADroid/src/main/res/drawable-hdpi/info.png similarity index 100% rename from app/src/main/res/drawable-hdpi/info.png rename to SWADroid/src/main/res/drawable-hdpi/info.png diff --git a/app/src/main/res/drawable-hdpi/lab.png b/SWADroid/src/main/res/drawable-hdpi/lab.png similarity index 100% rename from app/src/main/res/drawable-hdpi/lab.png rename to SWADroid/src/main/res/drawable-hdpi/lab.png diff --git a/app/src/main/res/drawable-hdpi/link.png b/SWADroid/src/main/res/drawable-hdpi/link.png similarity index 100% rename from app/src/main/res/drawable-hdpi/link.png rename to SWADroid/src/main/res/drawable-hdpi/link.png diff --git a/app/src/main/res/drawable-hdpi/msg.png b/SWADroid/src/main/res/drawable-hdpi/msg.png similarity index 100% rename from app/src/main/res/drawable-hdpi/msg.png rename to SWADroid/src/main/res/drawable-hdpi/msg.png diff --git a/app/src/main/res/drawable-hdpi/msg_received.png b/SWADroid/src/main/res/drawable-hdpi/msg_received.png similarity index 100% rename from app/src/main/res/drawable-hdpi/msg_received.png rename to SWADroid/src/main/res/drawable-hdpi/msg_received.png diff --git a/app/src/main/res/drawable-hdpi/msg_write.png b/SWADroid/src/main/res/drawable-hdpi/msg_write.png similarity index 100% rename from app/src/main/res/drawable-hdpi/msg_write.png rename to SWADroid/src/main/res/drawable-hdpi/msg_write.png diff --git a/app/src/main/res/drawable-hdpi/my_groups.png b/SWADroid/src/main/res/drawable-hdpi/my_groups.png similarity index 100% rename from app/src/main/res/drawable-hdpi/my_groups.png rename to SWADroid/src/main/res/drawable-hdpi/my_groups.png diff --git a/app/src/main/res/drawable-hdpi/not_ok.png b/SWADroid/src/main/res/drawable-hdpi/not_ok.png similarity index 100% rename from app/src/main/res/drawable-hdpi/not_ok.png rename to SWADroid/src/main/res/drawable-hdpi/not_ok.png diff --git a/app/src/main/res/drawable-hdpi/note.png b/SWADroid/src/main/res/drawable-hdpi/note.png similarity index 100% rename from app/src/main/res/drawable-hdpi/note.png rename to SWADroid/src/main/res/drawable-hdpi/note.png diff --git a/app/src/main/res/drawable-hdpi/notif.png b/SWADroid/src/main/res/drawable-hdpi/notif.png similarity index 100% rename from app/src/main/res/drawable-hdpi/notif.png rename to SWADroid/src/main/res/drawable-hdpi/notif.png diff --git a/app/src/main/res/drawable-hdpi/ok.png b/SWADroid/src/main/res/drawable-hdpi/ok.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ok.png rename to SWADroid/src/main/res/drawable-hdpi/ok.png diff --git a/app/src/main/res/drawable-hdpi/padlock_green.png b/SWADroid/src/main/res/drawable-hdpi/padlock_green.png similarity index 100% rename from app/src/main/res/drawable-hdpi/padlock_green.png rename to SWADroid/src/main/res/drawable-hdpi/padlock_green.png diff --git a/app/src/main/res/drawable-hdpi/padlock_red.png b/SWADroid/src/main/res/drawable-hdpi/padlock_red.png similarity index 100% rename from app/src/main/res/drawable-hdpi/padlock_red.png rename to SWADroid/src/main/res/drawable-hdpi/padlock_red.png diff --git a/app/src/main/res/drawable-hdpi/parent.png b/SWADroid/src/main/res/drawable-hdpi/parent.png similarity index 100% rename from app/src/main/res/drawable-hdpi/parent.png rename to SWADroid/src/main/res/drawable-hdpi/parent.png diff --git a/app/src/main/res/drawable-hdpi/prado_no.png b/SWADroid/src/main/res/drawable-hdpi/prado_no.png similarity index 100% rename from app/src/main/res/drawable-hdpi/prado_no.png rename to SWADroid/src/main/res/drawable-hdpi/prado_no.png diff --git a/app/src/main/res/drawable-hdpi/qr.png b/SWADroid/src/main/res/drawable-hdpi/qr.png similarity index 100% rename from app/src/main/res/drawable-hdpi/qr.png rename to SWADroid/src/main/res/drawable-hdpi/qr.png diff --git a/app/src/main/res/drawable-hdpi/refresh.png b/SWADroid/src/main/res/drawable-hdpi/refresh.png similarity index 100% rename from app/src/main/res/drawable-hdpi/refresh.png rename to SWADroid/src/main/res/drawable-hdpi/refresh.png diff --git a/app/src/main/res/drawable-hdpi/roll_call.png b/SWADroid/src/main/res/drawable-hdpi/roll_call.png similarity index 100% rename from app/src/main/res/drawable-hdpi/roll_call.png rename to SWADroid/src/main/res/drawable-hdpi/roll_call.png diff --git a/app/src/main/res/drawable-hdpi/survey.png b/SWADroid/src/main/res/drawable-hdpi/survey.png similarity index 100% rename from app/src/main/res/drawable-hdpi/survey.png rename to SWADroid/src/main/res/drawable-hdpi/survey.png diff --git a/app/src/main/res/drawable-hdpi/syllabus.png b/SWADroid/src/main/res/drawable-hdpi/syllabus.png similarity index 100% rename from app/src/main/res/drawable-hdpi/syllabus.png rename to SWADroid/src/main/res/drawable-hdpi/syllabus.png diff --git a/app/src/main/res/drawable-hdpi/test.png b/SWADroid/src/main/res/drawable-hdpi/test.png similarity index 100% rename from app/src/main/res/drawable-hdpi/test.png rename to SWADroid/src/main/res/drawable-hdpi/test.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_down_disabled.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_down_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_down_disabled.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_down_disabled.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_down_disabled_focused.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_down_disabled_focused.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_down_disabled_focused.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_down_disabled_focused.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_down_normal.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_down_normal.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_down_normal.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_down_normal.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_down_pressed.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_down_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_down_pressed.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_down_pressed.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_down_selected.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_down_selected.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_down_selected.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_down_selected.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_input_disabled.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_input_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_input_disabled.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_input_disabled.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_input_normal.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_input_normal.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_input_normal.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_input_normal.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_input_pressed.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_input_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_input_pressed.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_input_pressed.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_input_selected.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_input_selected.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_input_selected.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_input_selected.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_up_disabled.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_up_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_up_disabled.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_up_disabled.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_up_disabled_focused.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_up_disabled_focused.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_up_disabled_focused.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_up_disabled_focused.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_up_normal.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_up_normal.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_up_normal.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_up_normal.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_up_pressed.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_up_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_up_pressed.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_up_pressed.9.png diff --git a/app/src/main/res/drawable-hdpi/timepicker_up_selected.9.png b/SWADroid/src/main/res/drawable-hdpi/timepicker_up_selected.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/timepicker_up_selected.9.png rename to SWADroid/src/main/res/drawable-hdpi/timepicker_up_selected.9.png diff --git a/app/src/main/res/drawable-hdpi/users.png b/SWADroid/src/main/res/drawable-hdpi/users.png similarity index 100% rename from app/src/main/res/drawable-hdpi/users.png rename to SWADroid/src/main/res/drawable-hdpi/users.png diff --git a/app/src/main/res/drawable-mdpi/announce.png b/SWADroid/src/main/res/drawable-mdpi/announce.png similarity index 100% rename from app/src/main/res/drawable-mdpi/announce.png rename to SWADroid/src/main/res/drawable-mdpi/announce.png diff --git a/app/src/main/res/drawable-mdpi/ass.png b/SWADroid/src/main/res/drawable-mdpi/ass.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ass.png rename to SWADroid/src/main/res/drawable-mdpi/ass.png diff --git a/app/src/main/res/drawable-mdpi/back.png b/SWADroid/src/main/res/drawable-mdpi/back.png similarity index 100% rename from app/src/main/res/drawable-mdpi/back.png rename to SWADroid/src/main/res/drawable-mdpi/back.png diff --git a/app/src/main/res/drawable-mdpi/book.png b/SWADroid/src/main/res/drawable-mdpi/book.png similarity index 100% rename from app/src/main/res/drawable-mdpi/book.png rename to SWADroid/src/main/res/drawable-mdpi/book.png diff --git a/app/src/main/res/drawable-mdpi/btn_check_buttonless_on.png b/SWADroid/src/main/res/drawable-mdpi/btn_check_buttonless_on.png similarity index 100% rename from app/src/main/res/drawable-mdpi/btn_check_buttonless_on.png rename to SWADroid/src/main/res/drawable-mdpi/btn_check_buttonless_on.png diff --git a/app/src/main/res/drawable-mdpi/crs.png b/SWADroid/src/main/res/drawable-mdpi/crs.png similarity index 100% rename from app/src/main/res/drawable-mdpi/crs.png rename to SWADroid/src/main/res/drawable-mdpi/crs.png diff --git a/app/src/main/res/drawable-mdpi/desk.png b/SWADroid/src/main/res/drawable-mdpi/desk.png similarity index 100% rename from app/src/main/res/drawable-mdpi/desk.png rename to SWADroid/src/main/res/drawable-mdpi/desk.png diff --git a/app/src/main/res/drawable-mdpi/enrollment.png b/SWADroid/src/main/res/drawable-mdpi/enrollment.png similarity index 100% rename from app/src/main/res/drawable-mdpi/enrollment.png rename to SWADroid/src/main/res/drawable-mdpi/enrollment.png diff --git a/app/src/main/res/drawable-mdpi/enrollment_request.png b/SWADroid/src/main/res/drawable-mdpi/enrollment_request.png similarity index 100% rename from app/src/main/res/drawable-mdpi/enrollment_request.png rename to SWADroid/src/main/res/drawable-mdpi/enrollment_request.png diff --git a/app/src/main/res/drawable-mdpi/fabirthdaycake.png b/SWADroid/src/main/res/drawable-mdpi/fabirthdaycake.png similarity index 100% rename from app/src/main/res/drawable-mdpi/fabirthdaycake.png rename to SWADroid/src/main/res/drawable-mdpi/fabirthdaycake.png diff --git a/app/src/main/res/drawable-mdpi/faq.png b/SWADroid/src/main/res/drawable-mdpi/faq.png similarity index 100% rename from app/src/main/res/drawable-mdpi/faq.png rename to SWADroid/src/main/res/drawable-mdpi/faq.png diff --git a/app/src/main/res/drawable-mdpi/file.png b/SWADroid/src/main/res/drawable-mdpi/file.png similarity index 100% rename from app/src/main/res/drawable-mdpi/file.png rename to SWADroid/src/main/res/drawable-mdpi/file.png diff --git a/app/src/main/res/drawable-mdpi/folder.png b/SWADroid/src/main/res/drawable-mdpi/folder.png similarity index 100% rename from app/src/main/res/drawable-mdpi/folder.png rename to SWADroid/src/main/res/drawable-mdpi/folder.png diff --git a/app/src/main/res/drawable-mdpi/folder_open.png b/SWADroid/src/main/res/drawable-mdpi/folder_open.png similarity index 100% rename from app/src/main/res/drawable-mdpi/folder_open.png rename to SWADroid/src/main/res/drawable-mdpi/folder_open.png diff --git a/app/src/main/res/drawable-mdpi/folder_users.png b/SWADroid/src/main/res/drawable-mdpi/folder_users.png similarity index 100% rename from app/src/main/res/drawable-mdpi/folder_users.png rename to SWADroid/src/main/res/drawable-mdpi/folder_users.png diff --git a/app/src/main/res/drawable-mdpi/follow.png b/SWADroid/src/main/res/drawable-mdpi/follow.png similarity index 100% rename from app/src/main/res/drawable-mdpi/follow.png rename to SWADroid/src/main/res/drawable-mdpi/follow.png diff --git a/app/src/main/res/drawable-mdpi/forum.png b/SWADroid/src/main/res/drawable-mdpi/forum.png similarity index 100% rename from app/src/main/res/drawable-mdpi/forum.png rename to SWADroid/src/main/res/drawable-mdpi/forum.png diff --git a/app/src/main/res/drawable-mdpi/forward.png b/SWADroid/src/main/res/drawable-mdpi/forward.png similarity index 100% rename from app/src/main/res/drawable-mdpi/forward.png rename to SWADroid/src/main/res/drawable-mdpi/forward.png diff --git a/app/src/main/res/drawable-mdpi/grades.png b/SWADroid/src/main/res/drawable-mdpi/grades.png similarity index 100% rename from app/src/main/res/drawable-mdpi/grades.png rename to SWADroid/src/main/res/drawable-mdpi/grades.png diff --git a/app/src/main/res/drawable-mdpi/home.png b/SWADroid/src/main/res/drawable-mdpi/home.png similarity index 100% rename from app/src/main/res/drawable-mdpi/home.png rename to SWADroid/src/main/res/drawable-mdpi/home.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_accept.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_accept.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_accept.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_accept.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_person.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_add_person.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_add_person.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_add_person.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_read.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_read.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_read.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_read.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_refresh.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_refresh.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_refresh.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_refresh.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_reply.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_reply.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_reply.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_reply.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_save.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_save.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_save.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_save.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_search.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_send_now.png b/SWADroid/src/main/res/drawable-mdpi/ic_action_send_now.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_action_send_now.png rename to SWADroid/src/main/res/drawable-mdpi/ic_action_send_now.png diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_black.png b/SWADroid/src/main/res/drawable-mdpi/ic_arrow_back_black.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_arrow_back_black.png rename to SWADroid/src/main/res/drawable-mdpi/ic_arrow_back_black.png diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_black.png b/SWADroid/src/main/res/drawable-mdpi/ic_arrow_forward_black.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_arrow_forward_black.png rename to SWADroid/src/main/res/drawable-mdpi/ic_arrow_forward_black.png diff --git a/app/src/main/res/drawable-mdpi/ic_dialog_alert.png b/SWADroid/src/main/res/drawable-mdpi/ic_dialog_alert.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_dialog_alert.png rename to SWADroid/src/main/res/drawable-mdpi/ic_dialog_alert.png diff --git a/app/src/main/res/drawable-mdpi/ic_launcher_swadroid.png b/SWADroid/src/main/res/drawable-mdpi/ic_launcher_swadroid.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_launcher_swadroid.png rename to SWADroid/src/main/res/drawable-mdpi/ic_launcher_swadroid.png diff --git a/app/src/main/res/drawable-mdpi/ic_menu_star.png b/SWADroid/src/main/res/drawable-mdpi/ic_menu_star.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_menu_star.png rename to SWADroid/src/main/res/drawable-mdpi/ic_menu_star.png diff --git a/app/src/main/res/drawable-mdpi/info.png b/SWADroid/src/main/res/drawable-mdpi/info.png similarity index 100% rename from app/src/main/res/drawable-mdpi/info.png rename to SWADroid/src/main/res/drawable-mdpi/info.png diff --git a/app/src/main/res/drawable-mdpi/lab.png b/SWADroid/src/main/res/drawable-mdpi/lab.png similarity index 100% rename from app/src/main/res/drawable-mdpi/lab.png rename to SWADroid/src/main/res/drawable-mdpi/lab.png diff --git a/app/src/main/res/drawable-mdpi/link.png b/SWADroid/src/main/res/drawable-mdpi/link.png similarity index 100% rename from app/src/main/res/drawable-mdpi/link.png rename to SWADroid/src/main/res/drawable-mdpi/link.png diff --git a/app/src/main/res/drawable-mdpi/msg.png b/SWADroid/src/main/res/drawable-mdpi/msg.png similarity index 100% rename from app/src/main/res/drawable-mdpi/msg.png rename to SWADroid/src/main/res/drawable-mdpi/msg.png diff --git a/app/src/main/res/drawable-mdpi/msg_received.png b/SWADroid/src/main/res/drawable-mdpi/msg_received.png similarity index 100% rename from app/src/main/res/drawable-mdpi/msg_received.png rename to SWADroid/src/main/res/drawable-mdpi/msg_received.png diff --git a/app/src/main/res/drawable-mdpi/msg_write.png b/SWADroid/src/main/res/drawable-mdpi/msg_write.png similarity index 100% rename from app/src/main/res/drawable-mdpi/msg_write.png rename to SWADroid/src/main/res/drawable-mdpi/msg_write.png diff --git a/app/src/main/res/drawable-mdpi/my_groups.png b/SWADroid/src/main/res/drawable-mdpi/my_groups.png similarity index 100% rename from app/src/main/res/drawable-mdpi/my_groups.png rename to SWADroid/src/main/res/drawable-mdpi/my_groups.png diff --git a/app/src/main/res/drawable-mdpi/not_ok.png b/SWADroid/src/main/res/drawable-mdpi/not_ok.png similarity index 100% rename from app/src/main/res/drawable-mdpi/not_ok.png rename to SWADroid/src/main/res/drawable-mdpi/not_ok.png diff --git a/app/src/main/res/drawable-mdpi/note.png b/SWADroid/src/main/res/drawable-mdpi/note.png similarity index 100% rename from app/src/main/res/drawable-mdpi/note.png rename to SWADroid/src/main/res/drawable-mdpi/note.png diff --git a/app/src/main/res/drawable-mdpi/notif.png b/SWADroid/src/main/res/drawable-mdpi/notif.png similarity index 100% rename from app/src/main/res/drawable-mdpi/notif.png rename to SWADroid/src/main/res/drawable-mdpi/notif.png diff --git a/app/src/main/res/drawable-mdpi/ok.png b/SWADroid/src/main/res/drawable-mdpi/ok.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ok.png rename to SWADroid/src/main/res/drawable-mdpi/ok.png diff --git a/app/src/main/res/drawable-mdpi/padlock_green.png b/SWADroid/src/main/res/drawable-mdpi/padlock_green.png similarity index 100% rename from app/src/main/res/drawable-mdpi/padlock_green.png rename to SWADroid/src/main/res/drawable-mdpi/padlock_green.png diff --git a/app/src/main/res/drawable-mdpi/padlock_red.png b/SWADroid/src/main/res/drawable-mdpi/padlock_red.png similarity index 100% rename from app/src/main/res/drawable-mdpi/padlock_red.png rename to SWADroid/src/main/res/drawable-mdpi/padlock_red.png diff --git a/app/src/main/res/drawable-mdpi/parent.png b/SWADroid/src/main/res/drawable-mdpi/parent.png similarity index 100% rename from app/src/main/res/drawable-mdpi/parent.png rename to SWADroid/src/main/res/drawable-mdpi/parent.png diff --git a/app/src/main/res/drawable-mdpi/prado_no.png b/SWADroid/src/main/res/drawable-mdpi/prado_no.png similarity index 100% rename from app/src/main/res/drawable-mdpi/prado_no.png rename to SWADroid/src/main/res/drawable-mdpi/prado_no.png diff --git a/app/src/main/res/drawable-mdpi/qr.png b/SWADroid/src/main/res/drawable-mdpi/qr.png similarity index 100% rename from app/src/main/res/drawable-mdpi/qr.png rename to SWADroid/src/main/res/drawable-mdpi/qr.png diff --git a/app/src/main/res/drawable-mdpi/refresh.png b/SWADroid/src/main/res/drawable-mdpi/refresh.png similarity index 100% rename from app/src/main/res/drawable-mdpi/refresh.png rename to SWADroid/src/main/res/drawable-mdpi/refresh.png diff --git a/app/src/main/res/drawable-mdpi/roll_call.png b/SWADroid/src/main/res/drawable-mdpi/roll_call.png similarity index 100% rename from app/src/main/res/drawable-mdpi/roll_call.png rename to SWADroid/src/main/res/drawable-mdpi/roll_call.png diff --git a/app/src/main/res/drawable-mdpi/survey.png b/SWADroid/src/main/res/drawable-mdpi/survey.png similarity index 100% rename from app/src/main/res/drawable-mdpi/survey.png rename to SWADroid/src/main/res/drawable-mdpi/survey.png diff --git a/app/src/main/res/drawable-mdpi/syllabus.png b/SWADroid/src/main/res/drawable-mdpi/syllabus.png similarity index 100% rename from app/src/main/res/drawable-mdpi/syllabus.png rename to SWADroid/src/main/res/drawable-mdpi/syllabus.png diff --git a/app/src/main/res/drawable-mdpi/test.png b/SWADroid/src/main/res/drawable-mdpi/test.png similarity index 100% rename from app/src/main/res/drawable-mdpi/test.png rename to SWADroid/src/main/res/drawable-mdpi/test.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_down_disabled.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_down_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_down_disabled.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_down_disabled.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_down_disabled_focused.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_down_disabled_focused.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_down_disabled_focused.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_down_disabled_focused.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_down_normal.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_down_normal.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_down_normal.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_down_normal.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_down_pressed.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_down_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_down_pressed.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_down_pressed.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_down_selected.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_down_selected.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_down_selected.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_down_selected.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_input_disabled.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_input_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_input_disabled.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_input_disabled.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_input_normal.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_input_normal.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_input_normal.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_input_normal.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_input_pressed.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_input_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_input_pressed.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_input_pressed.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_input_selected.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_input_selected.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_input_selected.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_input_selected.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_up_disabled.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_up_disabled.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_up_disabled.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_up_disabled.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_up_disabled_focused.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_up_disabled_focused.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_up_disabled_focused.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_up_disabled_focused.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_up_normal.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_up_normal.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_up_normal.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_up_normal.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_up_pressed.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_up_pressed.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_up_pressed.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_up_pressed.9.png diff --git a/app/src/main/res/drawable-mdpi/timepicker_up_selected.9.png b/SWADroid/src/main/res/drawable-mdpi/timepicker_up_selected.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/timepicker_up_selected.9.png rename to SWADroid/src/main/res/drawable-mdpi/timepicker_up_selected.9.png diff --git a/app/src/main/res/drawable-mdpi/users.png b/SWADroid/src/main/res/drawable-mdpi/users.png similarity index 100% rename from app/src/main/res/drawable-mdpi/users.png rename to SWADroid/src/main/res/drawable-mdpi/users.png diff --git a/app/src/main/res/drawable-xhdpi/fabirthdaycake.png b/SWADroid/src/main/res/drawable-xhdpi/fabirthdaycake.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/fabirthdaycake.png rename to SWADroid/src/main/res/drawable-xhdpi/fabirthdaycake.png diff --git a/app/src/main/res/drawable-xhdpi/follow.png b/SWADroid/src/main/res/drawable-xhdpi/follow.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/follow.png rename to SWADroid/src/main/res/drawable-xhdpi/follow.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_accept.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_accept.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_accept.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_accept.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_person.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_add_person.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_add_person.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_add_person.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_read.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_read.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_read.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_read.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_refresh.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_refresh.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_refresh.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reply.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_reply.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_reply.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_reply.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_save.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_save.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_save.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_save.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_search.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_send_now.png b/SWADroid/src/main/res/drawable-xhdpi/ic_action_send_now.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_action_send_now.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_action_send_now.png diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png b/SWADroid/src/main/res/drawable-xhdpi/ic_arrow_back_black.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_arrow_back_black.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_arrow_back_black.png diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_black.png b/SWADroid/src/main/res/drawable-xhdpi/ic_arrow_forward_black.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_arrow_forward_black.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_arrow_forward_black.png diff --git a/app/src/main/res/drawable-xhdpi/ic_dialog_alert.png b/SWADroid/src/main/res/drawable-xhdpi/ic_dialog_alert.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_dialog_alert.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_dialog_alert.png diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_swadroid.png b/SWADroid/src/main/res/drawable-xhdpi/ic_launcher_swadroid.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_launcher_swadroid.png rename to SWADroid/src/main/res/drawable-xhdpi/ic_launcher_swadroid.png diff --git a/app/src/main/res/drawable-xhdpi/prado_no.png b/SWADroid/src/main/res/drawable-xhdpi/prado_no.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/prado_no.png rename to SWADroid/src/main/res/drawable-xhdpi/prado_no.png diff --git a/app/src/main/res/drawable-xxhdpi/fabirthdaycake.png b/SWADroid/src/main/res/drawable-xxhdpi/fabirthdaycake.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/fabirthdaycake.png rename to SWADroid/src/main/res/drawable-xxhdpi/fabirthdaycake.png diff --git a/app/src/main/res/drawable-xxhdpi/follow.png b/SWADroid/src/main/res/drawable-xxhdpi/follow.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/follow.png rename to SWADroid/src/main/res/drawable-xxhdpi/follow.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_accept.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_accept.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_accept.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_accept.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_add_person.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_add_person.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_add_person.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_read.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_read.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_read.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_read.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_refresh.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_refresh.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_refresh.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reply.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_reply.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_reply.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_reply.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_save.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_save.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_save.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_save.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_search.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_search.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_search.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_send_now.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_action_send_now.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_action_send_now.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_action_send_now.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_arrow_back_black.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_black.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_arrow_forward_black.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_arrow_forward_black.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_arrow_forward_black.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_swadroid.png b/SWADroid/src/main/res/drawable-xxhdpi/ic_launcher_swadroid.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_launcher_swadroid.png rename to SWADroid/src/main/res/drawable-xxhdpi/ic_launcher_swadroid.png diff --git a/app/src/main/res/drawable-xxhdpi/prado_no.png b/SWADroid/src/main/res/drawable-xxhdpi/prado_no.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/prado_no.png rename to SWADroid/src/main/res/drawable-xxhdpi/prado_no.png diff --git a/app/src/main/res/drawable-xxxhdpi/fabirthdaycake.png b/SWADroid/src/main/res/drawable-xxxhdpi/fabirthdaycake.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/fabirthdaycake.png rename to SWADroid/src/main/res/drawable-xxxhdpi/fabirthdaycake.png diff --git a/app/src/main/res/drawable-xxxhdpi/follow.png b/SWADroid/src/main/res/drawable-xxxhdpi/follow.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/follow.png rename to SWADroid/src/main/res/drawable-xxxhdpi/follow.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_back_black.png b/SWADroid/src/main/res/drawable-xxxhdpi/ic_arrow_back_black.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_arrow_back_black.png rename to SWADroid/src/main/res/drawable-xxxhdpi/ic_arrow_back_black.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black.png b/SWADroid/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black.png rename to SWADroid/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_swadroid.png b/SWADroid/src/main/res/drawable-xxxhdpi/ic_launcher_swadroid.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_launcher_swadroid.png rename to SWADroid/src/main/res/drawable-xxxhdpi/ic_launcher_swadroid.png diff --git a/app/src/main/res/drawable/ic_launcher_swadroid_notif.png b/SWADroid/src/main/res/drawable/ic_launcher_swadroid_notif.png similarity index 100% rename from app/src/main/res/drawable/ic_launcher_swadroid_notif.png rename to SWADroid/src/main/res/drawable/ic_launcher_swadroid_notif.png diff --git a/app/src/main/res/drawable/navigation_button.xml b/SWADroid/src/main/res/drawable/navigation_button.xml similarity index 100% rename from app/src/main/res/drawable/navigation_button.xml rename to SWADroid/src/main/res/drawable/navigation_button.xml diff --git a/app/src/main/res/drawable/timepicker_down_btn.xml b/SWADroid/src/main/res/drawable/timepicker_down_btn.xml similarity index 100% rename from app/src/main/res/drawable/timepicker_down_btn.xml rename to SWADroid/src/main/res/drawable/timepicker_down_btn.xml diff --git a/app/src/main/res/drawable/timepicker_input.xml b/SWADroid/src/main/res/drawable/timepicker_input.xml similarity index 100% rename from app/src/main/res/drawable/timepicker_input.xml rename to SWADroid/src/main/res/drawable/timepicker_input.xml diff --git a/app/src/main/res/drawable/timepicker_up_btn.xml b/SWADroid/src/main/res/drawable/timepicker_up_btn.xml similarity index 100% rename from app/src/main/res/drawable/timepicker_up_btn.xml rename to SWADroid/src/main/res/drawable/timepicker_up_btn.xml diff --git a/app/src/main/res/drawable/title_button.xml b/SWADroid/src/main/res/drawable/title_button.xml similarity index 100% rename from app/src/main/res/drawable/title_button.xml rename to SWADroid/src/main/res/drawable/title_button.xml diff --git a/app/src/main/res/drawable/title_refresh.png b/SWADroid/src/main/res/drawable/title_refresh.png similarity index 100% rename from app/src/main/res/drawable/title_refresh.png rename to SWADroid/src/main/res/drawable/title_refresh.png diff --git a/app/src/main/res/drawable/title_refresh_pressed.9.png b/SWADroid/src/main/res/drawable/title_refresh_pressed.9.png similarity index 100% rename from app/src/main/res/drawable/title_refresh_pressed.9.png rename to SWADroid/src/main/res/drawable/title_refresh_pressed.9.png diff --git a/app/src/main/res/drawable/title_refresh_selected.9.png b/SWADroid/src/main/res/drawable/title_refresh_selected.9.png similarity index 100% rename from app/src/main/res/drawable/title_refresh_selected.9.png rename to SWADroid/src/main/res/drawable/title_refresh_selected.9.png diff --git a/app/src/main/res/drawable/usr_bl.png b/SWADroid/src/main/res/drawable/usr_bl.png similarity index 100% rename from app/src/main/res/drawable/usr_bl.png rename to SWADroid/src/main/res/drawable/usr_bl.png diff --git a/app/src/main/res/layout-v11/tests_num_questions.xml b/SWADroid/src/main/res/layout-v11/tests_num_questions.xml similarity index 100% rename from app/src/main/res/layout-v11/tests_num_questions.xml rename to SWADroid/src/main/res/layout-v11/tests_num_questions.xml diff --git a/app/src/main/res/layout/action_bar.xml b/SWADroid/src/main/res/layout/action_bar.xml similarity index 100% rename from app/src/main/res/layout/action_bar.xml rename to SWADroid/src/main/res/layout/action_bar.xml diff --git a/app/src/main/res/layout/birthday_layout.xml b/SWADroid/src/main/res/layout/birthday_layout.xml similarity index 100% rename from app/src/main/res/layout/birthday_layout.xml rename to SWADroid/src/main/res/layout/birthday_layout.xml diff --git a/app/src/main/res/layout/capture.xml b/SWADroid/src/main/res/layout/capture.xml similarity index 100% rename from app/src/main/res/layout/capture.xml rename to SWADroid/src/main/res/layout/capture.xml diff --git a/app/src/main/res/layout/course_or_group_name.xml b/SWADroid/src/main/res/layout/course_or_group_name.xml similarity index 100% rename from app/src/main/res/layout/course_or_group_name.xml rename to SWADroid/src/main/res/layout/course_or_group_name.xml diff --git a/app/src/main/res/layout/create_account_activity.xml b/SWADroid/src/main/res/layout/create_account_activity.xml similarity index 69% rename from app/src/main/res/layout/create_account_activity.xml rename to SWADroid/src/main/res/layout/create_account_activity.xml index 3b443602f..20cdd7da1 100644 --- a/app/src/main/res/layout/create_account_activity.xml +++ b/SWADroid/src/main/res/layout/create_account_activity.xml @@ -47,7 +47,8 @@ android:layout_height="wrap_content" android:hint="@string/nickName" android:maxLines="1" - android:singleLine="true" /> + android:singleLine="true" + android:inputType="textEmailAddress" /> - + + + + + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/serverSpinner" + android:layout_alignLeft="@+id/serverSpinner" + android:layout_alignStart="@+id/serverSpinner" + android:visibility="gone" + android:inputType="textUri" />