Merge branch 'release/1.3.1'
This commit is contained in:
commit
531a653655
91
README.md
91
README.md
|
|
@ -1,84 +1,49 @@
|
|||
# SWADroid
|
||||
SWADroid
|
||||
========
|
||||
|
||||
Android client for e-learning platform [][swad]
|
||||
Android client for e-learning platform [](http://openswad.org/)
|
||||
|
||||
[][apk]
|
||||
[](https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid)
|
||||
|
||||
* Code: `git clone https://github.com/Amab/SWADroid.git`
|
||||
* Issue tracker: <https://github.com/Amab/SWADroid/issues>
|
||||
- Code: `git clone https://github.com/Amab/SWADroid.git`
|
||||
- Issue tracker: https://github.com/Amab/SWADroid/issues
|
||||
|
||||
[][Twitter]
|
||||
[][Facebook]
|
||||
[][Google+]
|
||||
[][Wordpress]
|
||||
[](http://twitter.com/SWADroid)[](https://www.facebook.com/SWADroid)[](https://plus.google.com/115615684349730524355/posts)[](http://swadroid.wordpress.com)
|
||||
|
||||
|
||||
## Copyright and License
|
||||
Copyright and License
|
||||
---------------------
|
||||
|
||||
Copyright (C) 2010, Juan Miguel Boyero Corral
|
||||
|
||||
[][gplv3]
|
||||
SWADroid client is free software; you can redistribute it and/or modify
|
||||
it under the same terms as [GPLv3][gplv3] license.
|
||||
[](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.
|
||||
|
||||
[][lgplv3]
|
||||
SWADroid uses [Android DataFrameWork][androiddataframework-library] library developed by [Javier Pérez Pacheco][androiddataframework-author] and licensed under [LGPLv3][lgplv3].
|
||||
[](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).
|
||||
|
||||
[][mit]
|
||||
SWADroid uses [ksoap2-android][ksoap2-library] library developed by [Manfred Moser][ksoap2-author] and licensed under [MIT][mit].
|
||||
[](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).
|
||||
|
||||
[][apache2]
|
||||
SWADroid uses [ZXing][zxing-library] library developed by [Sean Owen][zxing-author] and licensed under [Apache License 2.0][apache2].
|
||||
[](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).
|
||||
|
||||
[][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].
|
||||
[](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).
|
||||
|
||||
[][apache2]
|
||||
SWADroid uses [MathJax][mathjax] library developed by The MathJax Team and licensed under [Apache License 2.0][apache2].
|
||||
[](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
|
||||
Author
|
||||
------
|
||||
|
||||
* [Juan Miguel Boyero Corral][urlJuanMiguel]
|
||||
- [Juan Miguel Boyero Corral](http://www.linkedin.com/pub/juan-miguel-boyero-corral/27/362/163)
|
||||
|
||||
## Contributors
|
||||
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]
|
||||
- [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
|
||||
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
|
||||
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.
|
||||
|
|
|
|||
62
SWADroid/build.gradle
Normal file
62
SWADroid/build.gradle
Normal file
|
|
@ -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'
|
||||
}
|
||||
17
SWADroid/lint.xml
Normal file
17
SWADroid/lint.xml
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<lint>
|
||||
<issue id="BackButton" severity="warning" />
|
||||
<issue id="EasterEgg" severity="warning" />
|
||||
<issue id="FieldGetter" severity="warning" />
|
||||
<issue id="GradleDynamicVersion" severity="warning" />
|
||||
<issue id="IconExpectedSize" severity="warning" />
|
||||
<issue id="NewerVersionAvailable" severity="warning" />
|
||||
<issue id="RtlCompat" severity="error" />
|
||||
<issue id="RtlEnabled" severity="warning" />
|
||||
<issue id="RtlHardcoded" severity="warning" />
|
||||
<issue id="RtlSymmetry" severity="error" />
|
||||
<issue id="SelectableText" severity="warning" />
|
||||
<issue id="StopShip" severity="warning" />
|
||||
<issue id="TypographyQuotes" severity="warning" />
|
||||
<issue id="UnusedIds" severity="warning" />
|
||||
</lint>
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="es.ugr.swad.swadroid"
|
||||
android:installLocation="auto"
|
||||
android:versionCode="70"
|
||||
android:versionName="1.3" >
|
||||
android:installLocation="auto" >
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
|
|
@ -55,15 +53,15 @@
|
|||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.PreferencesActivity"
|
||||
android:name=".preferences.PreferencesActivity"
|
||||
android:label="@string/set_preferences" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.RecoverPassword"
|
||||
android:name=".modules.password.RecoverPassword"
|
||||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.Login"
|
||||
android:name=".modules.login.Login"
|
||||
android:label="@string/loginModuleLabel"
|
||||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
|
|
@ -103,7 +101,7 @@
|
|||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.Groups"
|
||||
android:name=".modules.groups.Groups"
|
||||
android:label="@string/rollcallModuleLabel"
|
||||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
|
|
@ -119,14 +117,15 @@
|
|||
</intent-filter>
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.Courses"
|
||||
android:name=".modules.courses.Courses"
|
||||
android:label="@string/coursesModuleLabel"
|
||||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.notifications.Notifications"
|
||||
android:label="@string/notificationsModuleLabel"
|
||||
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
|
||||
android:parentActivityName="es.ugr.swad.swadroid.SWADMain"
|
||||
android:exported="true">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="es.ugr.swad.swadroid.SWADMain" />
|
||||
|
|
@ -192,7 +191,7 @@
|
|||
android:label="@string/messagesModuleLabel">
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.Notices"
|
||||
android:name=".modules.notices.Notices"
|
||||
android:label="@string/noticesModuleLabel"
|
||||
android:theme="@style/Theme.AppCompat.Translucent"
|
||||
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
|
||||
|
|
@ -232,7 +231,7 @@
|
|||
android:value="es.ugr.swad.swadroid.SWADMain" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.GroupTypes"
|
||||
android:name=".modules.groups.GroupTypes"
|
||||
android:label="@string/groupTypesModuleLabel"
|
||||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
|
|
@ -242,7 +241,7 @@
|
|||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.modules.GenerateQR"
|
||||
android:name=".modules.qr.GenerateQR"
|
||||
android:theme="@style/Theme.AppCompat.Light"
|
||||
android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
|
||||
<meta-data
|
||||
|
|
@ -279,7 +278,7 @@
|
|||
android:configChanges="orientation|screenSize"
|
||||
android:theme="@style/Theme.AppCompat.Light"
|
||||
android:label="@string/createAccountModuleLabel"
|
||||
android:parentActivityName="es.ugr.swad.swadroid.LoginActivity" >
|
||||
android:parentActivityName=".modules.login.LoginActivity" >
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="es.ugr.swad.swadroid.SWADMain" />
|
||||
|
|
@ -295,7 +294,7 @@
|
|||
android:theme="@style/Theme.AppCompat.Translucent" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="es.ugr.swad.swadroid.LoginActivity"
|
||||
android:name=".modules.login.LoginActivity"
|
||||
android:theme="@style/Theme.AppCompat.Light"
|
||||
android:label="@string/title_activity_login"
|
||||
android:windowSoftInputMode="adjustResize|stateVisible" >
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user