Skip to content

Commit 083c6f6

Browse files
championswimmerchampionswimmer
committed
version 0.3.6
 * fixed notesfragment bugs, made faster. Signed-off-by: Arnav Gupta <[email protected]>
1 parent 3fe7de8 commit 083c6f6

File tree

5 files changed

+43
-23
lines changed

5 files changed

+43
-23
lines changed

‎.idea/gradle.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,8 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1615
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
17+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
1718
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1819
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1920
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -89,17 +90,22 @@
8990
<orderEntry type="library" exported="" name="facebook-android-sdk-3.21.1" level="project" />
9091
<orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
9192
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="palette-v7-21.0.0" level="project" />
94+
<orderEntry type="library" exported="" name="fbcore-0.4.0" level="project" />
9295
<orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
9396
<orderEntry type="library" exported="" name="Parse-1.8.2" level="project" />
94-
<orderEntry type="library" exported="" name="ion-2.0.5" level="project" />
9597
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
98+
<orderEntry type="library" exported="" name="ion-2.0.5" level="project" />
99+
<orderEntry type="library" exported="" name="imagepipeline-0.4.0" level="project" />
96100
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
101+
<orderEntry type="library" exported="" name="fresco-0.4.0" level="project" />
97102
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
98103
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
99104
<orderEntry type="library" exported="" name="tokenautocomplete-1.2.1" level="project" />
105+
<orderEntry type="library" exported="" name="drawee-0.4.0" level="project" />
106+
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
100107
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
101108
<orderEntry type="library" exported="" name="universal-image-loader-1.9.0" level="project" />
102109
<orderEntry type="library" exported="" name="androidasync-2.0.5" level="project" />
103110
</component>
104-
</module>
105-
111+
</module>

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "in.tosc.studddin"
1010
minSdkVersion 10
1111
targetSdkVersion 21
12-
versionCode 36
13-
versionName "0.3.6"
12+
versionCode 37
13+
versionName "0.3.7"
1414
}
1515
signingConfigs {
1616
debug {

‎app/manifest-merger-release-report.txt‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ MERGED from com.android.support:cardview-v7:21.0.3:16:5
5858
MERGED from com.facebook.android:facebook-android-sdk:3.21.1:24:5
5959
MERGED from com.android.support:support-v4:21.0.3:16:5
6060
MERGED from com.google.android.gms:play-services:6.5.87:20:5
61+
MERGED from com.android.support:support-v4:21.0.3:16:5
62+
MERGED from com.android.support:palette-v7:21.0.0:16:5
6163
MERGED from com.android.support:support-v4:21.0.3:16:5
6264
android:label
6365
ADDED from AndroidManifest.xml:21:9
@@ -75,32 +77,34 @@ ADDED from AndroidManifest.xml:23:9
7577
ADDED from AndroidManifest.xml:26:13
7678
android:label
7779
ADDED from AndroidManifest.xml:25:13
80+
android:theme
81+
ADDED from AndroidManifest.xml:27:13
7882
android:name
7983
ADDED from AndroidManifest.xml:24:13
8084
intent-filter#android.intent.action.MAIN+android.intent.category.DEFAULT+android.intent.category.LAUNCHER
81-
ADDED from AndroidManifest.xml:27:13
85+
ADDED from AndroidManifest.xml:28:13
8286
action#android.intent.action.MAIN
83-
ADDED from AndroidManifest.xml:28:17
87+
ADDED from AndroidManifest.xml:29:17
8488
android:name
85-
ADDED from AndroidManifest.xml:28:25
89+
ADDED from AndroidManifest.xml:29:25
8690
category#android.intent.category.DEFAULT
87-
ADDED from AndroidManifest.xml:30:17
88-
android:name
89-
ADDED from AndroidManifest.xml:30:27
90-
category#android.intent.category.LAUNCHER
9191
ADDED from AndroidManifest.xml:31:17
9292
android:name
9393
ADDED from AndroidManifest.xml:31:27
94+
category#android.intent.category.LAUNCHER
95+
ADDED from AndroidManifest.xml:32:17
96+
android:name
97+
ADDED from AndroidManifest.xml:32:27
9498
activity#in.tosc.studddin.MainActivity
95-
ADDED from AndroidManifest.xml:34:9
99+
ADDED from AndroidManifest.xml:35:9
96100
android:windowSoftInputMode
97-
ADDED from AndroidManifest.xml:37:13
101+
ADDED from AndroidManifest.xml:38:13
98102
android:label
99-
ADDED from AndroidManifest.xml:36:13
103+
ADDED from AndroidManifest.xml:37:13
100104
android:name
101-
ADDED from AndroidManifest.xml:35:13
105+
ADDED from AndroidManifest.xml:36:13
102106
intent-filter#android.intent.action.MAIN
103-
ADDED from AndroidManifest.xml:38:13
107+
ADDED from AndroidManifest.xml:39:13
104108
activity#com.luminous.pick.CustomGalleryActivity
105109
ADDED from AndroidManifest.xml:43:9
106110
android:name
@@ -142,6 +146,14 @@ ADDED from AndroidManifest.xml:63:9
142146
ADDED from AndroidManifest.xml:64:13
143147
android:value
144148
ADDED from AndroidManifest.xml:65:13
149+
service#in.tosc.studddin.fragments.notes.NotesUploadService
150+
ADDED from AndroidManifest.xml:67:9
151+
android:exported
152+
ADDED from AndroidManifest.xml:70:13
153+
android:enabled
154+
ADDED from AndroidManifest.xml:69:13
155+
android:name
156+
ADDED from AndroidManifest.xml:68:13
145157
uses-sdk
146158
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
147159
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
153165
MERGED from com.facebook.android:facebook-android-sdk:3.21.1:20:5
154166
MERGED from com.android.support:support-v4:21.0.3:15:5
155167
MERGED from com.google.android.gms:play-services:6.5.87:18:5
168+
MERGED from com.android.support:support-v4:21.0.3:15:5
169+
MERGED from com.android.support:palette-v7:21.0.0:15:5
156170
MERGED from com.android.support:support-v4:21.0.3:15:5
157171
android:targetSdkVersion
158172
INJECTED from AndroidManifest.xml:0:0

0 commit comments

Comments
 (0)