version 0.3.6

* fixed notesfragment bugs, made faster. Signed-off-by: Arnav Gupta <[email protected]>
teamOSC · Apr 26, 2015 · 083c6f6 · 083c6f6
1 parent 3fe7de8
commit 083c6f6
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 23 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/app.iml b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="LearnHut_android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Studdd.in" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -12,8 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -89,17 +90,22 @@
     <orderEntry type="library" exported="" name="facebook-android-sdk-3.21.1" level="project" />
     <orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="palette-v7-21.0.0" level="project" />
+    <orderEntry type="library" exported="" name="fbcore-0.4.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="Parse-1.8.2" level="project" />
-    <orderEntry type="library" exported="" name="ion-2.0.5" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="ion-2.0.5" level="project" />
+    <orderEntry type="library" exported="" name="imagepipeline-0.4.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="fresco-0.4.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
     <orderEntry type="library" exported="" name="tokenautocomplete-1.2.1" level="project" />
+    <orderEntry type="library" exported="" name="drawee-0.4.0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.0" level="project" />
     <orderEntry type="library" exported="" name="androidasync-2.0.5" level="project" />
   </component>
-</module>
-
+</module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "in.tosc.studddin"
         minSdkVersion 10
         targetSdkVersion 21
-        versionCode 36
-        versionName "0.3.6"
+        versionCode 37
+        versionName "0.3.7"
     }
     signingConfigs {
         debug {

diff --git a/app/manifest-merger-release-report.txt b/app/manifest-merger-release-report.txt
@@ -58,6 +58,8 @@ MERGED from com.android.support:cardview-v7:21.0.3:16:5
 MERGED from com.facebook.android:facebook-android-sdk:3.21.1:24:5
 MERGED from com.android.support:support-v4:21.0.3:16:5
 MERGED from com.google.android.gms:play-services:6.5.87:20:5
+MERGED from com.android.support:support-v4:21.0.3:16:5
+MERGED from com.android.support:palette-v7:21.0.0:16:5
 MERGED from com.android.support:support-v4:21.0.3:16:5
 	android:label
 		ADDED from AndroidManifest.xml:21:9
@@ -75,32 +77,34 @@ ADDED from AndroidManifest.xml:23:9
 		ADDED from AndroidManifest.xml:26:13
 	android:label
 		ADDED from AndroidManifest.xml:25:13
+	android:theme
+		ADDED from AndroidManifest.xml:27:13
 	android:name
 		ADDED from AndroidManifest.xml:24:13
 intent-filter#android.intent.action.MAIN+android.intent.category.DEFAULT+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:27:13
+ADDED from AndroidManifest.xml:28:13
 action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:28:17
+ADDED from AndroidManifest.xml:29:17
 	android:name
-		ADDED from AndroidManifest.xml:28:25
+		ADDED from AndroidManifest.xml:29:25
 category#android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:30:17
-	android:name
-		ADDED from AndroidManifest.xml:30:27
-category#android.intent.category.LAUNCHER
 ADDED from AndroidManifest.xml:31:17
 	android:name
 		ADDED from AndroidManifest.xml:31:27
+category#android.intent.category.LAUNCHER
+ADDED from AndroidManifest.xml:32:17
+	android:name
+		ADDED from AndroidManifest.xml:32:27
 activity#in.tosc.studddin.MainActivity
-ADDED from AndroidManifest.xml:34:9
+ADDED from AndroidManifest.xml:35:9
 	android:windowSoftInputMode
-		ADDED from AndroidManifest.xml:37:13
+		ADDED from AndroidManifest.xml:38:13
 	android:label
-		ADDED from AndroidManifest.xml:36:13
+		ADDED from AndroidManifest.xml:37:13
 	android:name
-		ADDED from AndroidManifest.xml:35:13
+		ADDED from AndroidManifest.xml:36:13
 intent-filter#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:38:13
+ADDED from AndroidManifest.xml:39:13
 activity#com.luminous.pick.CustomGalleryActivity
 ADDED from AndroidManifest.xml:43:9
 	android:name
@@ -142,6 +146,14 @@ ADDED from AndroidManifest.xml:63:9
 		ADDED from AndroidManifest.xml:64:13
 	android:value
 		ADDED from AndroidManifest.xml:65:13
+service#in.tosc.studddin.fragments.notes.NotesUploadService
+ADDED from AndroidManifest.xml:67:9
+	android:exported
+		ADDED from AndroidManifest.xml:70:13
+	android:enabled
+		ADDED from AndroidManifest.xml:69:13
+	android:name
+		ADDED from AndroidManifest.xml:68:13
 uses-sdk
 INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
 MERGED from com.android.support:appcompat-v7:21.0.3:15:5
@@ -153,6 +165,8 @@ MERGED from com.android.support:cardview-v7:21.0.3:15:5
 MERGED from com.facebook.android:facebook-android-sdk:3.21.1:20:5
 MERGED from com.android.support:support-v4:21.0.3:15:5
 MERGED from com.google.android.gms:play-services:6.5.87:18:5
+MERGED from com.android.support:support-v4:21.0.3:15:5
+MERGED from com.android.support:palette-v7:21.0.0:15:5
 MERGED from com.android.support:support-v4:21.0.3:15:5
 	android:targetSdkVersion
 		INJECTED from AndroidManifest.xml:0:0