Merge branch 'release/1.5.0'

Amab · Sep 1, 2016 · c29b55b · c29b55b
2 parents 259d1bf + b70ca95
commit c29b55b
Show file tree

Hide file tree

Showing 222 changed files with 3,664 additions and 1,123 deletions.
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ Copyright (C) 2010, Juan Miguel Boyero Corral
 
 [![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).
 
+[![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 [GSon](https://github.com/google/gson) library developed by Google and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+
 Author
 ------
 
@@ -40,6 +42,7 @@ Contributors
 -	[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/)
+-	[Rubén Martín Hidalgo](https://github.com/romilgildo)
 
 Contributing
 ------------

diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle
@@ -8,7 +8,7 @@ ext {
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24"
+    buildToolsVersion "24.0.2"
 
     dexOptions {
         maxProcessCount=2
@@ -56,12 +56,13 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:24.1.1'
-    compile 'com.android.support:appcompat-v7:24.1.1'
-    compile 'com.google.android.gms:play-services-analytics:9.2.1'
+    compile 'com.android.support:support-v4:24.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.google.android.gms:play-services-analytics:9.4.0'
     compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.1'
     compile 'commons-io:commons-io:2.5'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
     compile 'com.google.zxing:core:3.2.1'
+    compile 'com.google.code.gson:gson:2.7'
 }
diff --git a/SWADroid/src/main/AndroidManifest.xml b/SWADroid/src/main/AndroidManifest.xml
@@ -164,7 +164,7 @@
         </activity>
         <activity
             android:name="es.ugr.swad.swadroid.modules.messages.Messages"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:theme="@style/Theme.AppCompat.Light"
             android:label="@string/messagesModuleLabel"
             android:parentActivityName="es.ugr.swad.swadroid.SWADMain" >
@@ -173,16 +173,13 @@
                 android:value="es.ugr.swad.swadroid.SWADMain" />
         </activity>
         <activity
-            android:name="es.ugr.swad.swadroid.modules.messages.FilterUsersList"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.Light"
-            android:label="@string/filterUsersListModuleLabel">
-        </activity>
-        <activity
-            android:name="es.ugr.swad.swadroid.modules.messages.UsersList"
-            android:configChanges="orientation|screenSize"
+            android:name="es.ugr.swad.swadroid.modules.messages.SearchUsers"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:theme="@style/Theme.AppCompat.Light"
-            android:label="@string/messagesModuleLabel">
+            android:parentActivityName="es.ugr.swad.swadroid.modules.messages.Messages" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="es.ugr.swad.swadroid.modules.messages.Messages" />
         </activity>
         <activity
             android:name=".modules.notices.Notices"

diff --git a/SWADroid/src/main/assets/fonts/fontawesome-webfont.ttf b/SWADroid/src/main/assets/fonts/fontawesome-webfont.ttf
diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/Constants.java
@@ -227,6 +227,10 @@ public class Constants {
      * Request code for create a new account
      */
     public static final int CREATE_ACCOUNT_REQUEST_CODE = 39;
+    /**
+     * Request code for search users
+     */
+    public static final int SEARCH_USERS_REQUEST_CODE = 40;
     /**
      * Request code for CAMERA permission
      */