changed build tools version

VassilisPallas · May 8, 2016 · ec2890c · ec2890c
1 parent bf45215
commit ec2890c
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 34 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Comalat-Android.iml b/Comalat-Android.iml
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/app/app.iml b/app/app.iml
@@ -48,37 +48,41 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -96,6 +100,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -104,6 +109,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "org.sakaiproject.sakai"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -39,13 +38,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".UserActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_user"
             android:theme="@style/AppTheme.NoActionBar" />
-
         <activity
             android:name=".UserAboutActivity"
             android:configChanges="orientation|keyboardHidden|screenSize">
@@ -75,15 +72,12 @@
                 <data android:scheme="https" />
             </intent-filter>
         </activity>
-
         <activity android:name=".ChatActivity" />
-
         <activity android:name=".ConfirmAccountUpdateActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".UserActivity" />
         </activity>
-
         <activity android:name=".CommentsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -111,6 +105,8 @@
                 android:action="android.intent.action.VIEW"
                 android:data="http://developer.android.com" />
         </PreferenceScreen>
+
+        <activity android:name=".FriendsActivity"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/sakaiproject/adapters/ChatFriendsAdapter.java b/app/src/main/java/org/sakaiproject/adapters/ChatFriendsAdapter.java
@@ -26,11 +26,9 @@
 public class ChatFriendsAdapter extends RecyclerView.Adapter<ChatFriendsAdapter.ViewHolder> {
 
     private List<Friends> friends;
-    private String action;
 
-    public ChatFriendsAdapter(List<Friends> friends, String action) {
+    public ChatFriendsAdapter(List<Friends> friends) {
         this.friends = friends;
-        this.action = action;
     }
 
     @Override
@@ -52,20 +50,20 @@ public void onBindViewHolder(ViewHolder holder, int position) {
             }
             holder.name.setText(friend.getDisplayName());
 
-            if (action.equals("chat"))
-                if (friend.getOnlineStatus() == 0) {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_offline, context.getTheme()));
-                    } else {
-                        holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_offline));
-                    }
+            if (friend.getOnlineStatus() == 0) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_offline, context.getTheme()));
                 } else {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_online, context.getTheme()));
-                    } else {
-                        holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_online));
-                    }
+                    holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_offline));
                 }
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_online, context.getTheme()));
+                } else {
+                    holder.status.setImageDrawable(context.getResources().getDrawable(R.mipmap.ic_online));
+                }
+            }
+
         }
     }
 

diff --git a/app/src/main/java/org/sakaiproject/customviews/custom_volley/BooleanRequest.java b/app/src/main/java/org/sakaiproject/customviews/custom_volley/BooleanRequest.java
@@ -2,16 +2,11 @@
 
 import com.android.volley.AuthFailureError;
 import com.android.volley.NetworkResponse;
-import com.android.volley.ParseError;
 import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.VolleyLog;
 import com.android.volley.toolbox.HttpHeaderParser;
-import com.android.volley.toolbox.JsonObjectRequest;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
 

diff --git a/app/src/main/java/org/sakaiproject/sakai/ChatFriendsFragment.java b/app/src/main/java/org/sakaiproject/sakai/ChatFriendsFragment.java
@@ -109,7 +109,7 @@ public void onItemLongClick(View view, int position) {
     public void onSuccess(Object obj) {
         if (obj instanceof List<?>) {
             friends = (List<Friends>) obj;
-            adapter = new ChatFriendsAdapter(friends, "chat");
+            adapter = new ChatFriendsAdapter(friends);
             mRecyclerView.setAdapter(adapter);
         }
         swipeRefreshLayout.setRefreshing(false);

diff --git a/app/src/main/java/org/sakaiproject/sakai/HomeEventsTabFragment.java b/app/src/main/java/org/sakaiproject/sakai/HomeEventsTabFragment.java
@@ -31,6 +31,7 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -48,7 +49,7 @@ public class HomeEventsTabFragment extends Fragment implements Callback {
     public static GregorianCalendar cal_month;
     private String siteName;
     private SiteData siteData;
-    private List<UserEvents> todayEvents, monthlyEvents;
+    private List<UserEvents> monthlyEvents;
 
     public HomeEventsTabFragment() {
     }
@@ -147,6 +148,7 @@ private String todayDate() {
     @Override
     public void onSuccess(Object obj) {
         EventsCollection.getMonthEvents().clear();
+        List<UserEvents> todayEvents = new ArrayList<>();
 
         try {
             EventsCollection.selectedMonthEvents(String.valueOf(cal_month.get(cal_month.MONTH) + 1), cal_month);

diff --git a/app/src/main/java/org/sakaiproject/sakai/WelcomeFragment.java b/app/src/main/java/org/sakaiproject/sakai/WelcomeFragment.java
@@ -139,7 +139,7 @@ public void onSuccess(Object obj) {
                     }
                 }
             } else {
-                motd.setText(getContext().getResources().getString(R.string.motd));
+                motd.setText(getString(R.string.motd));
                 motdImage.setVisibility(View.VISIBLE);
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.google.gms:google-services:2.0.0-alpha6'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files