Skip to content

Commit

Permalink
fixed changes according to review
Browse files Browse the repository at this point in the history
  • Loading branch information
@vivekpanchal
vivekpanchal committed Nov 7, 2018
1 parent 11a62d9 commit 1af95b0
Show file tree
Hide file tree
Showing 12 changed files with 64 additions and 53 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions BuildItBigger.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="BuildItBigger" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
16 changes: 8 additions & 8 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,20 @@
<sourceFolder url="file://$MODULE_DIR$/src/free/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/free/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/free/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFree/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFree/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
Expand Down Expand Up @@ -132,6 +132,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
Expand Down Expand Up @@ -196,6 +197,5 @@
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0@jar" level="project" />
<orderEntry type="module" module-name="jokefactory" />
<orderEntry type="module" module-name="JavaJoker" />
</component>
</module>
3 changes: 1 addition & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
endpointsServer project(path: ':backend', configuration: 'endpoints')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.google.android.gms:play-services-ads:11.8.0'
freeImplementation 'com.google.android.gms:play-services-ads:11.8.0'
implementation 'com.google.api-client:google-api-client:1.23.0'
implementation 'com.google.http-client:google-http-client-android:1.23.0'
implementation 'com.google.code.findbugs:jsr305:3.0.2'

implementation project(":JavaJoker")
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<string name="instructions">Press the button for a delicious joke!</string>
<string name="button_text">Tell Joke</string>
<string name="action_settings">Settings</string>
<string name="banner_ad_unit_id">ca-app-pub-3940256099942544/6300978111</string>
<string name="jokeEnvelope">joke</string>
</resources>
Binary file modified backend/build/distributions/backend-discoveryDocs.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ...factory/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Tue Nov 06 23:39:34 IST 2018
D\:\\Udacity\ Projects\\GradlePRojects\\ud867-master\\FinalProject\\jokefactory\\src\\main\\res\\layout\\activity_display_joke.xml=D\:\\Udacity Projects\\GradlePRojects\\ud867-master\\FinalProject\\jokefactory\\build\\intermediates\\packaged_res\\debug\\layout\\activity_display_joke.xml
#Wed Nov 07 11:38:43 IST 2018
D\:\\Udacity\ Projects\\NanodegreePRojects\\BuildItBigger\\jokefactory\\src\\main\\res\\layout\\activity_display_joke.xml=D\:\\Udacity Projects\\NanodegreePRojects\\BuildItBigger\\jokefactory\\build\\intermediates\\packaged_res\\debug\\layout\\activity_display_joke.xml
2 changes: 1 addition & 1 deletion jokefactory/build/intermediates/incremental/packageDebugResources/merger.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\res"/><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\build\generated\res\rs\debug"/><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\build\generated\res\resValues\debug"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\res"><file name="activity_display_joke" path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\res\layout\activity_display_joke.xml" qualifiers="" type="layout"/><file path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">JokeFactory</string><string name="jokeEnvelope">joke</string></file></source><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\build\generated\res\rs\debug"/><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\debug\res"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\debug\res"/></dataSet><mergedItems/></merger>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\res"/><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\build\generated\res\rs\debug"/><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\build\generated\res\resValues\debug"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\res"><file name="activity_display_joke" path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\res\layout\activity_display_joke.xml" qualifiers="" type="layout"/><file path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\res\values\strings.xml" qualifiers=""><string name="app_name">JokeFactory</string><string name="jokeEnvelope">joke</string></file></source><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\build\generated\res\rs\debug"/><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\debug\res"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\debug\res"/></dataSet><mergedItems/></merger>
62 changes: 31 additions & 31 deletions jokefactory/build/outputs/logs/manifest-merger-debug-report.txt
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
-- Merging decision tree log ---
manifest
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
package
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:3:5-44
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:3:5-44
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:2:11-69
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:2:11-69
application
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:5:5-7:19
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:5:5-7:19
activity#com.vivek.panchal.jokefactory.DisplayJokeActivity
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:6:9-66
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:6:9-66
android:name
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml:6:19-54
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml:6:19-54
uses-sdk
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\GradlePRojects\ud867-master\FinalProject\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
ADDED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
INJECTED from D:\Udacity Projects\NanodegreePRojects\BuildItBigger\jokefactory\src\main\AndroidManifest.xml
Loading

0 comments on commit 1af95b0

Please sign in to comment.