Skip to content

Commit 6e59b4d

Browse files
parthibanloganathanparthibanloganathan
committed
fixes
1 parent 4911232 commit 6e59b4d

File tree

9 files changed

+37
-18
lines changed

9 files changed

+37
-18
lines changed

‎Phase2/AwesomeApp/app/app.iml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,22 +38,22 @@
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3940
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4243
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5456
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5657
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5758
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5859
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />

‎Phase3/AwesomeApp/app/app.iml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,22 +38,22 @@
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3940
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4243
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5456
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5657
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5758
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5859
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />

‎Phase3/AwesomeApp/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 19
5-
buildToolsVersion "20.0.0"
5+
buildToolsVersion "21.1.1"
66

77
defaultConfig {
88
applicationId "com.adi.awesomeapp"

‎Phase3/AwesomeApp/app/src/main/java/com/adi/awesomeapp/MainActivity.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,16 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
8484
}
8585
}
8686
}
87+
88+
/**
89+
* Notes: If you rotate your device, the photo will be disappear
90+
* and be replaced by the default image of the puppy.
91+
*
92+
* This is because the Activity is restarted on rotation. Rotations
93+
* trigger onConfigurationChanged() where you can store state
94+
* based on the current orientation.
95+
*
96+
* You can also store the state of the Activity by using onSaveInstanceState(),
97+
* which is called right before th OS destroys your Activity.
98+
*/
8799
}

‎Phase4/AwesomeApp/app/app.iml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,22 +38,22 @@
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3940
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4042
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4243
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4950
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5456
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5657
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5758
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5859
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />

‎Phase4/AwesomeApp/app/src/main/java/com/adi/awesomeapp/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public void onClick(View v) {
8181
* save a file with the current bitmap image
8282
*/
8383
File image = null;
84-
if (Utils.doesSavedImageExist(MainActivity.this)) {
85-
image = Utils.getSavedImage(MainActivity.this);
84+
if (Utils.doesSavedImageExist(getApplicationContext())) {
85+
image = Utils.getSavedImage(getApplicationContext());
8686
} else {
8787
image = Utils.saveToFile(
8888
MainActivity.this,

‎Phase4/AwesomeApp/app/src/main/java/com/adi/awesomeapp/TwitterService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ private TwitterService(final Context context) {
9090
* Network calls have to be made on a new thread since the
9191
* main thread handles UI and you never want to do synchronous
9292
* blocking operations there.
93+
*
94+
* If we wanted to be real fancy, we could use a ThreadPool.
9395
*/
9496
new Thread() {
9597
@Override
@@ -98,7 +100,7 @@ public void run() {
98100
try {
99101
/**
100102
* This is an Observable. They help us do lots of nifty
101-
* function stuff which is helpful when dealing with asynchronous tasks.
103+
* stuff which is helpful when dealing with asynchronous tasks.
102104
* We don't really use the full power of Observables here, but this is a
103105
* good intro to use them. Read more about them at
104106
* https://github.com/ReactiveX/RxJava/wiki/Observable
@@ -178,7 +180,7 @@ public void run() {
178180
* Here, we create an Observable from the getOAuthAccessToken result.
179181
* When the API call responds, our Observable emits an AccessToken object.
180182
* Since we subscribed to the Observable, we are ready to perform an action
181-
* as soon as we get teh AccessToken.
183+
* as soon as we get the AccessToken.
182184
*/
183185
Observable.just(twitter.getOAuthAccessToken(requestToken, oauthVerifier))
184186
.subscribeOn(Schedulers.io())

‎Phase5/AwesomeApp/app/src/main/java/com/adi/awesomeapp/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public void onClick(View v) {
8181
* save a file with the current bitmap image
8282
*/
8383
File image = null;
84-
if (Utils.doesSavedImageExist(MainActivity.this)) {
85-
image = Utils.getSavedImage(MainActivity.this);
84+
if (Utils.doesSavedImageExist(getApplicationContext())) {
85+
image = Utils.getSavedImage(getApplicationContext());
8686
} else {
8787
image = Utils.saveToFile(
8888
MainActivity.this,

‎Phase5/AwesomeApp/app/src/main/java/com/adi/awesomeapp/TwitterService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ private TwitterService(final Context context) {
9090
* Network calls have to be made on a new thread since the
9191
* main thread handles UI and you never want to do synchronous
9292
* blocking operations there.
93+
*
94+
* If we wanted to be real fancy, we could use a ThreadPool.
9395
*/
9496
new Thread() {
9597
@Override
@@ -98,7 +100,7 @@ public void run() {
98100
try {
99101
/**
100102
* This is an Observable. They help us do lots of nifty
101-
* function stuff which is helpful when dealing with asynchronous tasks.
103+
* stuff which is helpful when dealing with asynchronous tasks.
102104
* We don't really use the full power of Observables here, but this is a
103105
* good intro to use them. Read more about them at
104106
* https://github.com/ReactiveX/RxJava/wiki/Observable
@@ -178,7 +180,7 @@ public void run() {
178180
* Here, we create an Observable from the getOAuthAccessToken result.
179181
* When the API call responds, our Observable emits an AccessToken object.
180182
* Since we subscribed to the Observable, we are ready to perform an action
181-
* as soon as we get teh AccessToken.
183+
* as soon as we get the AccessToken.
182184
*/
183185
Observable.just(twitter.getOAuthAccessToken(requestToken, oauthVerifier))
184186
.subscribeOn(Schedulers.io())

0 commit comments

Comments
 (0)